#162 Resolve Travis build errors

Attempt to resolve Travis build errors (Work in progress)