Fixed minor issues with code style.
Merge remote-tracking branch 'origin/issue79' into issue79

Conflicts:
	ensime.py