Disabling tests on travis until I figure out why env vars aren't picked up.
Travis apparently MUST have a script directive.
Merge remote-tracking branch 'github/master' into dev-master
Merge dev-master into master