Minor changes and version bump
Merge branch 'master' of github.com:cloud66/c66toolbelt into dev