Using kramdown for markdown per github pages request https://help.github.com/articles/migrating-your-pages-site-from-maruku
Merge branch '3.0' into gh-pages