Minor changes
Merge
Merge branch 'master' of github.com:Izikiel/intel_multicore
New vimrc