More updates

Don't remember what these changes were
Merge branch 'master' of github.com:seanhagen/my-octopress-theme