Merge pull request #1 from jamesra/master

Minor bug fixes
Merge branch 'master'
Fixed case of parameter name
Move histogram generation to adjust contrast pipeline.  Should eventually have its own pipeline
Merge branch 'Nornir-Official'
Merge pull request #2 from jamesra/master

Minor fixes on the road to initial release
Removed semicolons
Merge branch 'dev'
Merge branch 'origin/master'
Merge branch 'master'
Merge branch 'dev'

Conflicts:
	nornir_buildmanager/config/Pipelines.xml
Merge branch 'dev'
Merge branch 'dev'

Conflicts:
	nornir_buildmanager/pipelinemanager.py
Merge branch 'master'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'
Merge branch 'dev'
Merge branch 'master'
Merge branch 'dev'