fix merge conflict
add back indents from over-zealous editor configuration
0.4.0

closes #6