set up some more
Merge branch 'master' of https://github.com/donnywals/KingsOfCode2014