Updated version for MancJS August 6th 2014
Merge branch 'master' into gh-pages

Conflicts:
	slides/thank-you.md