changed stripping due to inconsistencies between osx and linux
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.travis.yml
one travis update
Merge pull request #33 from c4ssio/master

fixed issue w script test