Merging test and travis updates to resolve issue #2

This resolves issue #2