Miscellaneous fixes
Miscellaneous fixes.
Miscellaneous fixes
Miscellaneous Fixes
Update Travis config file