Lots of fixing & clean-up.
Merge branch 'master' of github.com:duudel/bacteroids