Code cleanups

Signed-off-by: Brandyn A. White <bwhite@dappervision.com>
Merge branch 'wire' of github.com:OpenShades/wearscript into wire

Conflicts:
	android/WearScript Glass/src/main/java/com/dappervision/wearscript/BackgroundService.java
	android/WearScript Glass/src/main/java/com/dappervision/wearscript/WearScript.java