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

Conflicts:
	app/templates/podcasts/index.hbs