Merge remote-tracking branch 'origin/bugfix/no-skip' into odin
Removed unused `offset` parameter.
Line wrapping and error message nitpicking.
Remove an unused import.
Merge branch 'odin' of https://github.com/enthought/distarray into odin
Merge branch 'odin' into bug/fix-unary-and-binary-op-tests

Conflicts:
	.travis.yml
	Makefile
Fix unittest skips.

They need a string argument; the error message returned for this omission was pretty terrible.
Fix tests for wrapped ufuncs.

These "method form" tests were nonsense.  Why would I do that?
Merge branch 'odin' into bugfix/fix-testing-with-unittest

Conflicts:
	Makefile