Re-add master branch to ember-resolver in bower.json
Merge pull request #447 from xtian/github-shorthand

Re-add master branch to ember-resolver in bower.json