Merge pull request #143 from tripit/dev

Fix some bugs, clean up, and readme changes.

Thanks @lord!