v0.15; closes #27
tweak command line doco
fix conflicts
v0.15.1