Merge branch 'master' into themes

.gitignore

@@ -0,0 +1,2 @@
+vim/bundle/*
+!vim/bundle/Vundle.vim

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "vim/bundle/Vundle.vim"]
+	path = vim/bundle/Vundle.vim
+	url = https://github.com/VundleVim/Vundle.vim

bashrc

@@ -126,6 +126,8 @@ if [ -x /usr/bin/mint-fortune ]; then
 fi
 
 alias ..='cd ..'
+alias 2..='cd ../..'
+alias 3..='cd ../../..'
 alias vi='vim'
 alias clc='clear'
 alias a='acpi'

setup.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/bash
+
+# move existing files
+rm ~/.vimrc_old
+rm ~/.bashrc_old
+rm -r ~/.vim_old
+mv ~/.vimrc ~/.vimrc_old
+mv ~/.bashrc ~/.bashrc_old
+mv ~/.vim ~/.vim_old
+ln -s ~/.dotfiles/vimrc ~/.vimrc
+ln -s ~/.dotfiles/vim ~/.vim
+ln -s ~/.dotfiles/bashrc ~/.bashrc
+
+git submodule init
+git submodule update

vim/bundle/Lucius2

@@ -1 +0,0 @@
-Subproject commit d2f1baef189c2d0bac39f2948b26606a2b2ca5f5

vim/bundle/Vundle.vim

@@ -1 +1 @@
-Subproject commit 9a38216a1c0c597f978d73547d37681fc689c90d
+Subproject commit b255382d6242d7ea3877bf059d2934125e0c4d95

vim/bundle/YouCompleteMe

@@ -1 +0,0 @@
-Subproject commit c25e449f4e72667aca3d18d8bfccd7b289b2e9a1

vim/bundle/nerdtree

@@ -1 +0,0 @@
-Subproject commit 72c3656799289d4635520c28e17f737066ce19d6

vim/bundle/nerdtree-git-plugin

@@ -1 +0,0 @@
-Subproject commit 325a1298b0c9d8a4c61388a2f9956a534a9068cd

vim/bundle/vim-airline

@@ -1 +0,0 @@
-Subproject commit 98bc6abde3860600e599c7ad17fdfb80809c04af

vim/bundle/vim-airline-themes

@@ -1 +0,0 @@
-Subproject commit 3bfe1d00d48f7c35b7c0dd7af86229c9e63e14a9

vim/bundle/vim-colorschemes

@@ -1 +0,0 @@
-Subproject commit 2f532d0564534accf09cecfa9a1e3639865367ee

vimrc

@@ -6,18 +6,15 @@ call vundle#begin()
 Plugin 'VundleVim/Vundle.vim'
 
 "My Plugins"
-"Plugin 'ervandew/supertab'
+Plugin 'ervandew/supertab'
-Plugin 'Valloric/YouCompleteMe'
+"Plugin 'Valloric/YouCompleteMe'
 Plugin 'flazz/vim-colorschemes'
 Plugin 'vim-airline/vim-airline'
 Plugin 'vim-airline/vim-airline-themes'
 "Plugin 'vim-scripts/auto-pairs-gentle'
-"Plugin 'luochen1990/rainbow'
 "Plugin 'Yggdroot/indentLine'
 Plugin 'scrooloose/nerdtree'
 Plugin 'Xuyuanp/nerdtree-git-plugin'
-"Plugin 'rakr/vim-one'
-Plugin 'maksimr/Lucius2'
 
 call vundle#end()            " required
 filetype plugin indent on    " required