Modernize package structure, travis
Track 0.4 Dict and curly brace updates

Incidentally strip trailing whitespase along the way