Added an extra ignore
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pylint.ini
Added an extra ignore
Merge branch 'master' of https://github.com/wvangeit/python-mode
merge pylint.ini
Merge branch 'develop' of https://github.com/klen/python-mode
Updated pylint.ini
Merge branch 'develop' of https://github.com/klen/python-mode
Disabled one pylint warning
Merge branch 'develop' of https://github.com/klen/python-mode
Disabled extra comment in pylint.ini
Merge branch 'develop' of https://github.com/klen/python-mode

Conflicts:
	pylint.ini
Merge branch 'develop' of https://github.com/klen/python-mode
Fixed number of tab spaces
Added pullupstream script
Added bash call to script