First pass at removing some of the git submodules
Merge branch '454_github_submodules_issues' into devel