Merge remote-tracking branch 'upstream/master'
Merge master
Merge branch 'upstream-merge'
Revert "Merge branch 'upstream-merge'"

This reverts commit 8fc27e1aff9cfa3bc6ff9fc05da5350eb7ed3dcc, reversing
changes made to 05cc5301be2776dbc8bb6e815a47bf7b14c08bf5.
On with Travis
And test
Merge pull request #116 from CodaFi/travis-build

Travis CI Support