Merge pull request #1 from absalon-james/master

Initial commit.
Merge pull request #2 from absalon-james/master

Switched around database settings