Refactoring and changing some of the template JSON
Merge branch 'master' of https://github.com/erchenger/Wearable-Developer-Convention-2014