Merge pull request #1 from MasterPete/master

Upgrade to jekyll 1.x
Merge branch 'master' of github.com:MasterPete/levelup-website
Merge branch 'master' of github.com:MasterPete/levelup-website
Merge branch 'master' of github.com:MasterPete/levelup-website
Merge branch 'master' of github.com:MasterPete/levelup-website
Peter, Moved the haml file over to looping through data instead of hard coded data