Removed windowed settings sfrom text mode.
Merge branch 'master' of https://github.com/gabrielelanaro/emacs-for-python

Conflicts:
	.gitignore
Actual merge with upstream.