Python line length increased to 160
Merge branch 'master' of https://github.com/elguntor/home

Conflicts:
	.vimrc