Merge pull request #7 from csmith/master

Remove submodules.
Standardise the circle.yml we use.