tons of content updates
Merge branch 'master' of https://github.com/jacksondeane/jacksondeane.github.com