Incorporate feedback from GPS's code review
Merge branch 'dev' into features/gps_review

Conflicts:
	sandbox/lua/testsupport/counter.lua
Merge pull request #88 from mozilla-services/features/gps_review

Incorporate feedback from GPS's code review