Merge pull request #1 from jamesra/master

Minor bug fixes
Merge pull request #2 from jamesra/master

Many fixes for parameter passing in pool module
Merge branch 'origin/dev'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master' into nornir-master
Merge branch 'dev'
Merge branch 'dev'