Merge pull request #1 from jamesra/master

Minor bug fixes
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master'
Merge branch 'master' into nornir-master
Merge branch 'master' into nornir-master
zip_safe=True
Merge branch 'nornir-master' into dev
Remove message about debugging when debug flag is not set
Merge branch 'dev'