Simplify manager
Add matchmaker
Merge branch 'master' of github.com:forestbelton/spaceshit