Cleaning up code and refactoring so it is easier to maintain JSON even
though it is not JSON anymore...
Merge branch 'master' of https://github.com/erchenger/Wearable-Developer-Convention-2014.git