refactor code
Cleanup vimrc
Merge branch 'develop'