A few more improvements to autocomplete
Merge branch 'refs/heads/develop' into develop2

Conflicts:
	pyqode/core/modes/autocomplete.py