Removed (now broken) database stuff.
Merge branch 'develop' of https://github.com/simpeg/simpeg into develop