Loads of code cleanup
Merge branch 'master' of github.com:jerryjj/google_devfest2014

Conflicts:
	HandyTuner/wear/src/main/java/net/protoblogr/devfest/handytuner/LaunchActivity.java
	HandyTuner/wear/src/main/res/layout/activity_launch.xml
merge fix