Whitespace fixes
Removed tracing for Travis builds
Merge pull request #562 from hintjens/master

Removed tracing on router option setting