Boston Sept
Merge branch 'master' of https://github.com/emberwatch/emberwatch-source

Conflicts:
	data/talks.yml