Initial README fixes, test fixes should now pass.

Initial README fixes, but this still needs to be finished but
at least the travis-ci link will work.

Tests now pass locally but need to see if they will pass on the
build server.