Merge branch 'master' of https://github.com/coyote240/dotfiles

diff --cc dotvimrc
index 61811a79f0ecbf8e179d762113d7126c65ec434c,8e1da2fca44f56964499c8d3b121fc429917939f..bb595f6a67fb1a43e4d64955f9ce42ceaec22894
--- 1/dotvimrc
--- 2/dotvimrc
+++ b/dotvimrc
@@@ -25,8 -25,8 +25,9 @@@ filetype plugin indent o
  autocmd FileType make setlocal noexpandtab
  
  au BufNewFile,BufRead *.json set filetype=javascript
 +au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx
+ au BufNewFile,BufRead *.less set filetype=less
  au BufNewFile,BufRead *.md,*.txt setlocal textwidth=80
  au BufWritePost *.py call Flake8()
  au BufWritePost *.js :JSHint