Change the user location, fix #7
Merge branch 'master' into spikyspike

Conflicts:
	src/js/pebble-js-app.js
Merge pull request #10 from hwhelchel/bugfix

Bugfix