Merge branch 'master' into watch-app

Author: loudnate

Cartfile

@@ -2,5 +2,5 @@ github "loudnate/LoopKit" ~> 0.3
 github "loudnate/xDripG5" ~> 0.4
 github "loudnate/SwiftCharts" "loudnate/naterade"
 github "mddub/dexcom-share-client-swift" ~> 0.1
-github "ps2/rileylink_ios" "0.3.1"
+github "ps2/rileylink_ios" ~> 0.3.2
 github "mpurland/Amplitude-iOS" "framework"

Cartfile.resolved

@@ -2,6 +2,6 @@ github "mpurland/Amplitude-iOS" "934536d24cb9ce5c567c74ff12e2955faed74bc3"
 github "loudnate/Crypto" "e0ef5b498f2c373d676135dabf5d1803b8558509"
 github "loudnate/LoopKit" "v0.3.2"
 github "loudnate/SwiftCharts" "dc8f5fbb29e391a65995d138158139559e365a1e"
-github "mddub/dexcom-share-client-swift" "v0.1.0"
-github "ps2/rileylink_ios" "912f7892b42f812f8492aa9c3732d7994e13933e"
+github "mddub/dexcom-share-client-swift" "v0.1.2"
+github "ps2/rileylink_ios" "v0.3.2"
 github "loudnate/xDripG5" "0.4.1"

Loop/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

LoopTests/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

README.md

@@ -12,20 +12,17 @@ It exists as an example, so you can build one too.
 
 ### LoopKit
 
-Naterade is built on top of [LoopKit](https://github.com/loudnate/LoopKit). LoopKit is a set of tools to speed up development of your own app. It provides data storage, retrieval, and calcluation, as well as boilerplate view controllers. Most of all, it is agnostic to treatment decisions and input sources.
+Naterade is built on top of [LoopKit](https://github.com/loudnate/LoopKit). LoopKit is a set of tools to speed up development of your own closed-loop insulin delivery app. It provides data storage, retrieval, and calcluation, as well as boilerplate view controllers. Most of all, it is agnostic to treatment decisions and input sources.
 
 ## Can I run Naterade?
 
-I would prefer that you didn't, because:
+Unless your name is Nate, that might be weird for you. Instead, I'd encourage you to look at  [Loop](https://github.com/loudnate/Loop), which is nearly identical to Naterade but it has some additional benefits, like:
 
-### Your Diabetes My Vary
+* Setup and customization instructions
+* Stable, [gitflow](http://nvie.com/posts/a-successful-git-branching-model/)-based release process
 
-Your physiology, habits, and risk-tolerance are not the same as mine.
+Just remember **Your Diabetes May Vary**. Your physiology, habits, and risk-tolerance are not the same as mine. Use these tools at your own risk!
 
-### You should not trust what you did not build
+## License and Code of Conduct
 
-[@danamlewis](https://github.com/danamlewis) and [@scottleibrand](https://github.com/scottleibrand) [said this much better already](https://diyps.org/2015/03/31/why-the-diy-part-of-openaps-is-important/).
-
-## Finally
-
-Please read the [LICENSE](https://github.com/loudnate/naterade-ios/blob/master/LICENSE) and [CODE_OF_CONDUCT](https://github.com/loudnate/naterade-ios/blob/master/CODE_OF_CONDUCT.md)
+Please read the [LICENSE](https://github.com/loudnate/naterade-ios/blob/master/LICENSE) and [CODE_OF_CONDUCT](https://github.com/loudnate/naterade-ios/blob/master/CODE_OF_CONDUCT.md)

WatchApp Extension/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>

WatchApp/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.0</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>