Editorial work from dbooth; closes #13