travis fixes
Merge branch 'mably' of https://github.com/mably/btcnet into mably

Conflicts:
	.travis.yml