Merge pull request #1 from jeffcrow/master

Bug fix & SQLite support
Reorganized

Moved things into functions. Still some duplicate code. Also updated
the postgres schema
Minor local changes for initial experimentation.
Merge remote-tracking branch 'upstream/master'

Resolved conflict in parse.py