v0.3.1

Merge in changes, update docs and minor consistency edits.