Removed old LD_LIBRARY_PATH export in bashrc.
A few changes to vimrc files.
Merge remote-tracking branch 'origin/master'