Couple of changes to structure.
Merge branch 'master' of https://github.com/AmandaSutherland/ERRbot