Merge remote-tracking branch 'origin/master' into gh-pages
rake and sass removed no _site
Merge branch 'gh-pages'