minor formatting changes
Merge branch 'master' of https://github.com/cmhouston/excl-mobile

Conflicts:
	app/controllers/index.js