Code refactor/cleanup including the removal of hardcoded values
Merge branch 'devel' of http://github.com/jfharney/ScientificWorkspace into devel