Merge in readme changes
spaces v tabs
Merge dev for 0.1.0 release
Update master