Octopress files
Merge branch 'gh-pages'
Moved content into master and updated README