Added a bunch of things.
Merge branch 'master' of github.com:xorrbit/pegjam2013