Update back to Ember.js
Merge branch 'master' of https://github.com/StumblinGrumblin/Billables

Conflicts:
	index.html
	js/application.js
	js/database.json
Rough merge