jon 4f3771f4ce Merge branch 'master' of ssh://jonfu.com/home/jon/dots ...

Conflicts:
	bash/.bashrc
	vim/.vim/bundle/calendar.vim
	vim/.vim/bundle/jedi-vim
	vim/.vim/bundle/lightline.vim
	vim/.vim/bundle/nerdtree
	vim/.vim/bundle/syntastic
	vim/.vim/bundle/vim-fugitive

2018-06-24 15:15:36 -05:00

..

calendar.vim @ 25009a8eea

ugh

2018-06-24 15:15:18 -05:00

ctrlp.vim @ 564176f01d

Added all dotfiles

2017-07-09 19:22:08 -05:00

goyo.vim @ 5b8bd03787

Made a bunch of changes to shit whoops

2018-04-28 09:57:25 -05:00

indentpython.vim @ 6aaddfde21

Added all dotfiles

2017-07-09 19:22:08 -05:00

jedi-vim @ 48af2afd3e

ugh

2018-06-24 15:15:18 -05:00

lightline-buffer @ 128ddaad4a

Updated some stuff (great msg right?)

2018-06-21 17:16:04 -05:00

lightline.vim @ 78c43c1446

ugh

2018-06-24 15:15:18 -05:00

minibufexpl.vim @ ad72976ca3

Made a bunch of changes to shit whoops

2018-04-28 09:57:25 -05:00

nerdtree @ ed446e5cbe

ugh

2018-06-24 15:15:18 -05:00

python-mode @ f7ccee5474

Added all dotfiles

2017-07-09 19:22:08 -05:00

SimpylFold @ aa0371d9d7

Updated bashrc

2017-09-09 08:49:37 -05:00

syntastic @ b7b473b268

ugh

2018-06-24 15:15:18 -05:00

targets.vim @ c3042dc18a

Created tools dir for simple scripts

2018-06-21 12:30:32 -05:00

vim-airline @ 396cc92261

Created tools dir for simple scripts

2018-06-21 12:30:32 -05:00

vim-airline-themes @ 26f67b9265

Created tools dir for simple scripts

2018-06-21 12:30:32 -05:00

vim-buftabline @ 14d208b1fa

Main thing here was adding enter mapping in vim to

2018-05-23 09:34:49 -05:00

vim-easyescape @ 710f59bc13

Added easyescape for faster jk/kj escaping

2018-05-05 08:02:30 -05:00

vim-flake8 @ 91818a7d5f

Added all dotfiles

2017-07-09 19:22:08 -05:00

vim-fugitive @ b82abd5bd5

ugh

2018-06-24 15:15:18 -05:00

vim-surround @ e49d6c2459

Mapped C-Tab to function like alt-tab

2017-09-24 17:54:32 -05:00

Vundle.vim @ 9a38216a1c

ugh

2018-06-24 15:15:18 -05:00

dirindex.html

Updated some stuff (great msg right?)

2018-06-21 17:16:04 -05:00

index.html

Updated some stuff (great msg right?)

2018-06-21 17:16:04 -05:00