Still trying to work through commit issues...
Merge remote-tracking branch 'origin/gh-pages'