Fix #274
addressing comment and making timestamp = timestamptz
fixing errors
fixing pep8 errors
fixing comment
Merge pull request #316 from antgonza/issue_274_v2

Fix #274