Update dependencies
Improve formatting

Fixing some formatting errors and improving formatting consistency
elsewhere. Also add some space in tests for readability.
Fix travis