fix merge errors
Merge branch 'refactoring' of github.com:opentechinstitute/commotiond into refactoring