wip
Merge branch 'dev' of github.com:mattmarcum/embercatchr into dev

Conflicts:
	bower.json