diff --git a/.bash_profile b/.bash_profile
index 7aa13c5..9aee501 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -8,19 +8,6 @@
 # for ssh logins, install and configure the libpam-umask package.
 #umask 022
 
-PATH=/$HOME/bin:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/$HOME/.gem/ruby/1.9.1/bin:/$HOME/.cabal/bin:/usr/lib/go/bin:$PATH; export PATH
-case `uname` in
-SunOS)
-	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
-	PATH=$PATH:$UCB_PATH; export PATH
-	;;
-Darwin)
-	MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH
-	PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
-	export DISPLAY=:0.0
-	set completion-ignore-case on
-	;;
-esac
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
diff --git a/.bashrc b/.bashrc
index 8f76c72..6f0eadd 100644
--- a/.bashrc
+++ b/.bashrc
@@ -14,6 +14,20 @@ _JAVA_AWT_WM_NONREPARENTING=1; export _JAVA_AWT_WM_NONREPARENTING
 # set ENV to a file invoked each time sh is started for interactive use.
 ENV=$HOME/.bashrc; export ENV
 
+PATH=$HOME/bin:$HOME/.gem/ruby/1.9.1/bin:$HOME/.cabal/bin:$HOME/.go/bin:$PATH:/bin:/sbin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/usr/games:/usr/X11R6/bin:/usr/lib/go/bin; export PATH
+case `uname` in
+SunOS)
+	UCB_PATH=/usr/sww/lang/acl:/usr/sww/lang/jdk-1.5.0/bin:/usr/openwin/bin:/usr/dt/bin:/usr/sww/opt/java/bin:/usr/sww/bin:/share/b/grading/bin:/share/b/grading/sbin:/share/b/runas/sun4u:/share/b/bin:/home/aa/projects/scheme/bin:/usr/ucb:/usr/ccs/bin:/usr/sfw/bin; export UCB_PATH
+	PATH=$PATH:$UCB_PATH; export PATH
+	;;
+Darwin)
+	MACPORTS_PATH=/opt/local/bin:/opt/local/sbin:/opt/local/usr/bin:/opt/local/usr/local/bin; export MACPORTS_PATH
+	PATH=$HOME/bin:$MACPORTS_PATH:$PATH; export PATH
+	export DISPLAY=:0.0
+	set completion-ignore-case on
+	;;
+esac
+
 MAILPATH=/var/spool/mail/$USER
 for i in ~/mail/*
 do
diff --git a/.emacs.d/Cask b/.emacs.d/Cask
index 2fb7ab5..d240caa 100644
--- a/.emacs.d/Cask
+++ b/.emacs.d/Cask
@@ -10,6 +10,7 @@
 (depends-on "cask")
 (depends-on "cedit")
 (depends-on "company-go")
+(depends-on "dirtree")
 (depends-on "elpy")
 (depends-on "epc")
 (depends-on "evil")
@@ -33,4 +34,4 @@
 (depends-on "relative-buffers")
 (depends-on "tabbar")
 (depends-on "yasnippet")
-(depends-on "zenburn-theme")
\ No newline at end of file
+(depends-on "zenburn-theme")
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index 4670578..67aa0c4 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -1,6 +1,7 @@
 ;; /This/ file (~init.el~) that you are reading
 ;; should be in this folder
 (add-to-list 'load-path "~/.emacs.d/")
+(add-to-list 'load-path "~/.emacs.d/neotree")
 
 (if (< emacs-major-version 23)
   (defun characterp (obj) 
@@ -154,6 +155,7 @@
 
 ;; Neotree
 (require 'neotree)
+(menu-bar-mode -1)
 
 (require 'key-chord)
 (require 'tabbar)
diff --git a/.vimrc b/.vimrc
index ccd0cad..1be1d73 100644
--- a/.vimrc
+++ b/.vimrc
@@ -118,6 +118,7 @@ Plugin 'SirVer/ultisnips'
 Bundle 'honza/vim-snippets'
 Plugin 'JuliaLang/julia-vim'
 Plugin 'tpope/vim-surround'
+Bundle 'farseer90718/vim-taskwarrior'
 "https://git.wincent.com/command-t.git
 call vundle#end()
 filetype plugin indent on    " required