Version 0.1.3
Merge remote-tracking branch 'ember-cli-update/master'

Conflicts:
	.jshintrc
	README.md
	bower.json
	package.json