Merge https://github.com/kennyjoseph/ember-map-demo into kennyjoseph-master

Conflicts:
	js/app.js