add lots of things
Merge branch 'master' of github.com:ajdlinux/govhack2014