Various fixes

Try making a PR on the origin repo to see if that allows travis to use secure env.

Ref #32