Code cleanup.
Merge branch 'master' of https://github.com/mlakhia/mapify.io

Conflicts:
	src/js/background.js