Lots of stuff.
Merge branch 'master' of https://github.com/ritwikd/newsite
Merge pull request #2 from ritwikd/master

Moving changes over.