I need to get these two branches sorted out

Bringing master up to date with gh-pages for now. Need to get these correctly setup.