Merge branch 'master' of github.com:ryanc/dotfiles

.gitconfig

@@ -3,3 +3,5 @@
 	email = ryan@confabulator.net
 [color]
 	ui = true
+[push]
+	default = simple

.vim/colors/blackboard.vim

@@ -1,55 +0,0 @@
-" Vim color scheme
-"
-" Name:         blackboard.vim
-" Maintainer:   Ben Wyrosdick <ben.wyrosdick@gmail.com> 
-" Last Change:  20 August 2009
-" License:      public domain
-" Version:      1.4
-
-set background=dark
-hi clear
-if exists("syntax_on")
-   syntax reset
-endif
-
-let g:colors_name = "blackboard"
-
-if has("gui_running")
-  "GUI Colors
-  highlight Normal guifg=White   guibg=#0B1022
-  highlight Cursor guifg=Black   guibg=Yellow
-  highlight CursorLine guibg=#191E2F
-  highlight LineNr guibg=#323232 guifg=#888888
-  highlight Folded guifg=#f1f3e8 guibg=#444444
-  highlight Pmenu guibg=#84A7C1
-
-  "General Colors
-  highlight Comment guifg=#AEAEAE
-  highlight Constant guifg=#CAFE1E
-  highlight Keyword guifg=#FFDE00
-  highlight String guifg=#00D42D
-  highlight Type guifg=#84A7C1
-  highlight Identifier guifg=#00D42D gui=NONE
-  highlight Function guifg=#FF5600 gui=NONE
-  highlight clear Search
-  highlight Search guibg=#1C3B79
-  highlight PreProc guifg=#FF5600
-
-  "HTML Colors
-  highlight link htmlTag Type
-  highlight link htmlEndTag htmlTag
-  highlight link htmlTagName htmlTag
-
-  "Ruby Colors
-  highlight link rubyClass Keyword
-  highlight link rubyDefine Keyword
-  highlight link rubyConstant Type
-  highlight link rubySymbol Constant
-  highlight link rubyStringDelimiter rubyString
-  highlight link rubyInclude Keyword
-  highlight link rubyAttribute Keyword
-  highlight link rubyInstanceVariable Normal
-
-  "Rails Colors
-  highlight link railsMethod Type
-end

.vim/vimrc

@@ -125,8 +125,12 @@ Bundle 'https://github.com/zaki/zazen.git'
 Bundle 'https://github.com/jonathanfilip/vim-lucius.git'
 Bundle 'https://github.com/chriskempson/vim-tomorrow-theme.git'
 Bundle 'https://github.com/tangphillip/SunburstVIM.git'
+Bundle 'https://github.com/groenewege/vim-less.git'
+Bundle 'https://github.com/tpope/vim-fugitive.git'
+Bundle 'python.vim'
+Bundle 'https://github.com/nelstrom/vim-blackboard.git'
 Bundle 'https://github.com/tomasr/molokai.git'
-Bundle 'https://github.com/zeis/kolor.git'
+Bundle 'https://github.com/zeis/vim-kolor.git'
 Bundle 'https://github.com/morhetz/gruvbox.git'
 Bundle 'https://github.com/trapd00r/neverland-vim-theme.git'