routes expanded, db reset combined
idk wha is going on with these merges
Merge pull request #1 from atheiman/master

merging