Merge tag '3.6.0' into develop

3.6.0
Add note about @paetzke's Emacs plugin
Fix test to assume 2 spaces before inline commment ot adhere to pep8 and issue #129
Fix code to match tests
Merge pull request #131 from timothycrosley/feature/fix-issue-129

Feature/fix issue 129
Bump version to 3.6.1
Merge branch 'release/3.6.1'