Updating my branch since moving over to linux from windows
Merge branch 'cebo_develop' of https://github.com/fluffels/hamster into cebo_develop