implements #27
Merge branch 'refs/heads/develop' into develop2

Conflicts:
	pyqode/python/modes/comments.py
Fix pep8 issue