Updates 5-9-2014

- Small bug fixes
- Parsing fixes
- Remove cruft code
- Postgres for travis (hopefully)