Master Updates (IT MERGES!)
Merge branch 'asynchronous-slave' of https://github.com/willhodges/DISS into asynchronous-slave