Merge-error release fix

Had forgotten to merge master into release branch before 1.0.0 release, so a lot of fixes were missed, sorry. See
https://github.com/chucknorris/roundhouse/releases/1.0.0 for release details.