Added vim-slime plugin, and updated submodules
Added .inputrc and .tmux.conf files
Use remote dircolors, merge conflict
Pulled remote updates