Make some stuff actually work
Merge branch 'master' of https://github.com/TWolverson/Dispatcher.git