Add .DS_Store to gitignore
Update colorscheme on vimrc and add more filetypes to strip whitespace methods
Sublime text settings
Merge