Initial commit
Removed a bunch of names
Added back all the deleted names
Merge branch 'master' of github.com:hyperboy/mmwcon2014