set cindent here and all problems vanish
Fix fish shell if rbenv isn't installed
Move fonts out of vim
Remove solarized
Merge pull request #33 from alexdavid/colors

Remove solarized
Merge branch 'experimental' into fix_rbenv_missing

Conflicts:
	fish/config.fish
add live script support
Merge pull request #35 from seanstrom/feature/add-livescript

add live script support
add another hook for vim theming
Merge pull request #30 from alexdavid/fix_rbenv_missing

Fix fish shell if rbenv isn't installed
Merge pull request #31 from alexdavid/move_fonts

Move fonts out of vim
Merge pull request #36 from seanstrom/feature/vim-tmux-theme-hook

add another hook for vim theming
Merge pull request #37 from seanstrom/bug/coffeescript-comment-outdenting

set cindent here and all problems vanish
Merge branch 'experimental' of github.com:alexdavid/dotfiles into experimental