Merge branch 'hotfix-0.3.1'
Fix the CHANGELOG header for v0.3.0
Merge branch 'develop'

Fix an issue where master was out of date
Save the pidfile of the Python server to kill it

It's much cleaner to just kill the pid rather than attempt to use kill
all which could kill unintended processes.
Bump version number to 0.3.2
Merge branch 'hotfix-0.3.2' into develop