I hate git submodules

Maybe I don't get it, but to me the whole git submodule thing is
idiotic. This commit fixes everything but I had to resort to this:
http://stackoverflow.com/a/11258810/1765344