Spelling, added vim-julia
Small changes
Merge conflicts