Rake deploy - adding grunted files
Merge branch 'master' into gh-pages

Conflicts:
	dist/js/analytics.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	dist/js/analytics.js
re-minify code for _site