Removed cached submodule leftovers
Added files from old submodules directly
Merge pull request #101 from markguinn/master

Added submodule files back into vcs