Upgrade to travis, added bootstrap, embercli 1.3
Merge branch 'master' into upgrade

Conflicts:
	.travis.yml
Merge pull request #2 from ewilson/upgrade

Upgrade to travis, added bootstrap, embercli 1.3