Whitespace, some more precise messaging
Add __all__
Update readme
Merge tips
Less merge clobbering