change gvim colorscheme to lucius
Merge remote-tracking branch 'origin/public' into public
add .DS_Store to .gitignore