Revert "draft of lone star website"

This reverts commit 6089516a309361f00c9accc4c14c04b50c7b6343.
had to change some things around.
Merge branch 'gh-pages'
Merge branch 'master' into gh-pages