Committing for home.
No need to include 'Database' twice
Merge pull request #927 from pfeiffer/master

Removed unnecessary double inclusion of Database
Merge branch 'master' of https://github.com/michaelcarter/formtastic
Merge branch 'master' of https://github.com/justinfrench/formtastic