Merge pull request #4 from tgandrews/master

Clean up submodule craziness
Merge pull request #5 from tgandrews/master

Main is now useable
Merge pull request #6 from tgandrews/master

Performance measuring and minor optimisations