Merge pull request #37 from c410echo/dev

Echo 0.3.1
Merge pull request #9 from c410echo/master

Merge from master
Changes to reflect database and new adapters
Merge pull request #38 from mbeall/master

Changes to reflect database and new adapters