Adding ability to have default paramters
Moving default database add logic
cleanup
Merge pull request #76 from groupon/doug/defaultOverrides

Doug/default overrides