clean and fix and clean and fix
Merge branch 'master' of https://github.com/DeliriumNocturnum/Pyminion