Merge pull request #32 from jchodera/master

Fixed travis-ci, though not all doctests are working yet.  nosetests for tests/test_alchemy.py work.
Merge pull request #33 from jchodera/master

More updates to fix doctests.  Still one travis-ci failure due to unsuppressed weave output, but will fix that later.