Make database optional
Review fix
Make `deploy' py3k compatible
Fix Travis build
Merge pull request #20 from infoxchange/database-optional

Make database optional