Review: Wip 0.7

Work in progress toward v0.7. Merging now as it is functional on Linux and OSX