yountlabs-ify me
Merge remote-tracking branch 'pengwynn/master'

Conflicts:
	app/assets/javascripts/site.js.coffee
	config/application.rb
	content/pages/talks/refactoring-with-science.mdown
move images around