Fix rope, pep8
Add solarized
Add solarized to vimrc
Merge branch 'master' into topic/amz-config

Conflicts:
	vimrc