Testing travis stuff
Merge pull request #36 from jchodera/master

Fixing travis-ci [WIP]
Merge pull request #37 from kyleabeauchamp/travis

[WIP] Testing travis stuff
Merge remote-tracking branch 'upstream/master'
Merge pull request #39 from jchodera/master

Reworked p-xylene example.
Merge remote-tracking branch 'upstream/master'