Merge pull request #9 from bradoyler/master

fix .merge error and upgrade Ember \ Handlebars
added actions hashes to controllers
Merge pull request #1 from GavinJoyce/master

rebase