diff --git a/bash_aliases b/bash_aliases
index 282144a..2023407 100644
--- a/bash_aliases
+++ b/bash_aliases
@@ -1,9 +1,13 @@
 # vim: ft=sh
 #
 # some more ls aliases
+alias ls='ls -X --color=auto'
 alias ll='ls -Xlh --group-directories-first'
-alias la='ls -XA --group-directories-first'
+alias la='ls -XAh --group-directories-first'
+alias lal='ls -XAlh --group-directories-first'
 alias l='ls -XCF --group-directories-first'
+alias dir='ls --color=auto --format=vertical'
+alias grep='grep --color=auto'
 
 #alias sysupdate='sudo apt-get update && sudo apt-get dist-upgrade -u'
 
@@ -19,28 +23,32 @@ alias tmux="TERM=screen-256color tmux"
 #alias mountorion="sshfs orion: ~/orion/"
 #alias unmountorion="fusermount -u ~/orion/"
 
-alias ccb="ledger -c bal checking liabilities:mastercard bank:savings \
-assets:cash liabilities:govt"
+alias ccb="ledger -c bal checking liabilities:mastercard \
+    liabilities:visa bank:savings \
+    assets:cash liabilities:govt"
 
-alias cfb="ledger bal checking liabilities:mastercard bank:savings \
-assets:cash liabilities:govt"
+alias cfb="ledger bal checking liabilities:mastercard \
+    liabilities:visa bank:savings \
+    assets:cash liabilities:govt"
 
 alias cab="ledger bal checking liabilities:mastercard bank:savings \
 assets:cash liabilities:govt assets:portfolio:cash"
 
 alias getpodcasts="gpo update && gpo download"
-alias getcleared="ledger --cleared bal liabilities:mastercard checking"
+alias getcleared="ledger --cleared bal liabilities:mastercard liabilities:visa checking"
 alias networth="ledger -V --price-db ~/finances/prices.db bal \
-    assets:portfolio liabilities:mastercard bank:savings assets:cash \
-    bank:checking"
+    assets:portfolio liabilities:mastercard liabilities:visa \
+    bank:savings assets:cash bank:checking"
 
-alias edch="vim ~/finances/2014_checking.ldg"
-alias edmc="vim ~/finances/2014_mastercard.ldg"
-alias edin="vim ~/finances/2014_investments.ldg"
+alias edch="vim ~/finances/2016_checking.ldg"
+alias edmc="vim ~/finances/2016_mastercard.ldg"
+alias edv="vim ~/finances/2016_visa.ldg"
+alias edin="vim ~/finances/2016_investments.ldg"
 
-alias gedch="gvim ~/finances/2014_checking.ldg"
-alias gedmc="gvim ~/finances/2014_mastercard.ldg"
-alias gedin="gvim ~/finances/2014_investments.ldg"
+alias gedch="gvim ~/finances/2016_checking.ldg"
+alias gedmc="gvim ~/finances/2016_mastercard.ldg"
+alias gedv="gvim ~/finances/2016_visa.ldg"
+alias gedin="gvim ~/finances/2016_investments.ldg"
 
 alias ..="cd .."
 alias c='clear'
@@ -49,7 +57,6 @@ alias mkdir='mkdir -pv'
 alias mount='mount |column -t'
 alias h='history'
 alias edit='vim'
-alias st2='sublime-text-2'
 alias restart='sudo shutdown -r now'
 
 alias irssi="TERM=screen-256color irssi"
@@ -64,9 +71,17 @@ alias psx="ps auxw | grep $1"
 alias startdelta="VBoxHeadless --startvm freebsd &"
 alias killdelta="VBoxManage controlvm freebsd acpipowerbutton"
 alias delta="ssh jsjones@delta"
+alias startubuntu="VBoxHeadless --startvm ubuntu1510 &"
+alias killubuntu="VBoxManage controlvm ubuntu1510 acpipowerbutton"
+alias startcentos="VBoxHeadless --startvm Centos7 &"
+alias killcentos="VBoxManage controlvm Centos7 acpipowerbutton"
 
 alias awsconnect="ssh -i ~/.ec2/ec2.pem ubuntu@ec2-54-244-136-14.us-west-2.compute.amazonaws.com"
 
 alias cinnamon-restart='cinnamon --replace -d :0.0 >/dev/null 2>&1 &'
-alias android_dev="sh ~/android-studio/bin/studio.sh &"
-alias java-dev="sh ~/bin/intellijIDEA/bin/idea.sh &"
+alias android="sh ~/android-studio/bin/studio.sh &"
+alias intellij="sh ~/dev/intellij/idea-IC-141.713.2/bin/idea.sh &"
+alias webstorm="sh ~/dev/WebStorm-141.1237/bin/webstorm.sh &"
+alias koding='ssh -i ~/.ssh/id_rsa-vms jsj0nes@ujkk08e7bae9.jsj0nes.koding.io'
+alias bs='browser-sync start --server --port 3001 --files="./*"'
+alias startjekyll='cd $HOME/projects/githubpages && bundle exec jekyll serve --drafts --watch'
diff --git a/bashrc b/bashrc
index 725b659..a5957bf 100644
--- a/bashrc
+++ b/bashrc
@@ -2,17 +2,6 @@
 # see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
 # for examples
 
-# stuff from kyle wheeler's bashrc file.
-JSJDEBUG=${JSJDEBUG:-no}
-
-function dprint {
-if [[ $JSJDEBUG == yes && $- == *i* ]]; then
-    date "+%H:%M:%S $*"
-    echo $SECONDS $*
-fi
-}
-
-#dprint alive
 
 if [ -r "${HOME}/.bashrc.local.preload" ]; then
     dprint "Loading bashrc preload"
@@ -75,6 +64,8 @@ fi
 #esac
 
 export GIT_PS1_SHOWDIRTYSTATE=1
+export GIT_PS1_SHOWSTASHSTATE=1
+export GIT_PS1_SHOWUNTRACKEDFILES=1
 
 # Comment in the above and uncomment this below for a color prompt
 #PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
@@ -105,10 +96,6 @@ fi
 # enable color support of ls and also add handy aliases
 if [ "$TERM" != "dumb" ]; then
     eval "`dircolors -b`"
-    alias ls='ls -X --color=auto'
-    alias dir='ls --color=auto --format=vertical'
-    alias grep='grep --color=auto'
-    #alias vdir='ls --color=auto --format=long'
 fi
 
 # enable programmable completion features (you don't need to enable
@@ -137,19 +124,35 @@ echo $(date)
 
 source /home/jsjones/bin/functions
 
+export PATH=$PATH:/home/jsjones/bin:\
+/usr/local/bin:\
+/home/jsjones/bin/SynologyAssistant:\
+/home/jsjones/bin/android-sdk-linux/tools:\
+/home/jsjones/google_appengine:\
+/home/jsjones/dev/android-studio/bin:\
+/home/jsjones/dev/eclipse:\
+/home/jsjones/IDEs/VSCode-linux-x64
 
-export PATH=$PATH:/home/jsjones/bin:/home/jsjones/bin/SynologyAssistant/:/home/jsjones/bin/android-sdk-linux/tools:/usr/local/bin:/home/jsjones/google_appengine
 export MANPATH=$MANPATH:.:/home/jsjones/src/man:
-export TERM="xterm-256color"
+export TERM="screen-256color"
 export EDITOR="vim"
 export PRINTER="PSC-2350-series"
-export DEBFULLNAME="Jason Jones"
-export DEBEMAIL="jsjones96@gmail.com"
 export GIT_EDITOR="vim"
 export LEDGER="~/finances/master_ledger.ldg"
 export LEDGER_PRICE_DB="~/finances/prices.db"
-
+export MYVIMRC="~/.vim/config.vim"
 
 export CLASSPATH=$CLASSPATH:~/src/algs4/stdlib.jar:~/src/algs4/algs4.jar
+export JAVA_HOME="/opt/java/jdk1.7.0_67/"
+
 test -r ~/src/algs4/bin/config.sh && source ~/src/algs4/bin/config.sh
 
+test -r ~/bin/z.sh && source ~/bin/z.sh
+
+### Added by the Heroku Toolbelt
+export PATH="/usr/local/heroku/bin:$PATH"
+
+# added by travis gem
+[ -f /home/jsjones/.travis/travis.sh ] && source /home/jsjones/.travis/travis.sh
+
+export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
diff --git a/gitconfig b/gitconfig
index 70e0cbe..3ae9dc6 100644
--- a/gitconfig
+++ b/gitconfig
@@ -10,3 +10,12 @@
 [core]
 	autocrlf = input
 	editor = vim
+[push]
+	default = simple
+[alias]
+	st = status
+	undo = reset HEAD-1 --mixed
+	amend = commit -a --amend
+	co = checkout
+	ec = config --global -e
+    cm = commit -m
diff --git a/tmux.conf b/tmux.conf
index 9d95eca..15eb2ed 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,58 @@
-set-option -g prefix C-a
+# ### tmux.conf ###
 
+
+# Use vim keybindings in copy mode
+set -gw mode-keys vi
+
+# Update window title
+set -g set-titles on
+set -g set-titles-string '#T - #I:#W'
+
+# Setup 'v' to begin selection as in vim
+bind-key -t vi-copy v begin-selection
+bind-key -t vi-copy y copy-pipe "reattach-to-user-namespace pbcopy"
+#
+# Update default binding of `Enter` to also use copy-pipe
+# unbind -t vi-copy Enter
+# bind-key -t vi-copy Enter copy-pipe "reattach-to-user-namespace pbcopy"
+#
+#############################################################################
+#############################################################################
+# Reset Prefix
+#############################################################################
+unbind C-b
+set -g prefix C-Space
+bind-key Space send-prefix # for nested tmux sessions
+
+# force a reload of the config file
+unbind r
+bind r source-file ~/.tmux.conf
+
+# start window numbering at 1 for easier switching
+set -g base-index 1
+
+# make tmux display thing in 256 colors
 set -g default-terminal screen-256color
+
+# unicode
+setw -g utf8 on
+set -g status-utf8 on
+
+# vim movement bindings
+set-window-option -g mode-keys vi
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# split windows like vim
+bind s split-window -v
+bind v split-window -h
+
+# enable pane switching using the mouse
+set-window-option -g mouse-select-pane on
+set-window-option -g mouse-select-window on
+
+# sane scrolling
+set -g mode-mouse on
+
diff --git a/vimrc b/vimrc
index 1477ef3..42a95c6 100644
--- a/vimrc
+++ b/vimrc
@@ -1,12 +1,9 @@
 " =========================================================
-" Author: Jason Jones <jsjones96@gmail.com>
-"
 " This .vimrc file is tailored for my personal use, as it should be.
 " It is the top level file that sources all other configuations
 " and settings.
 " =========================================================
 
-
 " All of the plugins are installed with Vundle from this file.
 source ~/.vim/vundle.vim
 
@@ -16,15 +13,15 @@ filetype plugin indent on
 " All of the vim configuation.
 source ~/.vim/config.vim
 
-
 " Plugin specific configuation
 source ~/.vim/plugins.vim
 
-
 " Key Mappings
 source ~/.vim/mappings.vim
 
-
 " Load all the auto commands
 source ~/.vim/autocmds.vim
 
+" Load all custom functions
+source ~/.vim/functions.vim
+