First pass at removing some of the git submodules
Merge remote-tracking branch 'devel/454_github_submodules_issues' into devel-master