Updated out-of-date bits in README and travis; issue #21.
Merge commit '8938b08'