Merge branch 'gh-pages'
Added Awesome / pony tags
Merge branch 'master' into gh-pages