Merging in changes.
Working commit.
Merge branch 'master' of github.com:jesserosato/BackEnd
Cleaned up DB loading functions.