Distributed .vimrc onto several files for clearer structure.
Merge branch 'develop'