Revert "Revert "Merge remote-tracking branch 'origin/gh-pages' into gh-pages""
Revert "Revert "Merge remote-tracking branch 'origin/gh-pages' into gh-pages""

This reverts commit 9e4809b81c4a4bc396ff72eff52eb576cf3164a5.

resbaz/resbaz-2016-02-01,BillMills/resbaz-site,BillMills/resbaz-site,resbaz/resbaz-2016-02-01