Added documentation.
Switched to solarized dark theme.
Fixed conflict.

Merge branch 'master' of https://github.com/axlm/Environment

Conflicts:
	Vim/ax_vimrc