Tinkering with Angular/Google Maps interop
Merge branch 'master' of https://github.com/klgilbert/proximate

Conflicts:
	public/js/controllers/index.js
renaming module