Migrate to Jekyll
Ember.js Boston December
Merge branch 'jekyll'

Conflicts:
	data/people.json
	data/talks.json