0.6.0 new

All features in this branch are good to go for the next release.
I'll merge and fix this myself.