diff --git a/.ackrc b/.ackrc
index 778478a..1951e22 100644
--- a/.ackrc
+++ b/.ackrc
@@ -6,6 +6,7 @@
 --type-set=exclude=.orig
 --noexclude
 
+--ignore-dir=data
 --ignore-dir=tmp
 --ignore-dir=public
 --ignore-dir=bower_components
diff --git a/.gitconfig b/.gitconfig
index e449a2b..4585a00 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -45,4 +45,4 @@
   cmd = diffmerge --merge --result=$MERGED $LOCAL $BASE $REMOTE
   trustExitCode = true
 [push]
-	default = current
+  default = current
diff --git a/.gitignore b/.gitignore
index ae11aff..9c13fce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,3 @@
-/[A-Z]*
-Thumbs.db
 *.pem
 *.tmp
 .CFUserTextEncoding
@@ -35,6 +33,7 @@ Thumbs.db
 .heroku
 .hk
 .irb-history
+.irb/history
 .irb_history
 .jdk/
 .lein/
@@ -53,6 +52,7 @@ Thumbs.db
 .offlineimaprc
 .oracle_jre_usage/
 .overtone/
+.packer.d
 .postgres
 .pry_history
 .python-eggs
@@ -67,6 +67,7 @@ Thumbs.db
 .ssh
 .subversion
 .sup/
+.terraform.d
 .travis
 .trvs
 .tugboat
@@ -79,3 +80,5 @@ Thumbs.db
 .zsh/.*
 .zsh/secrets.zsh
 .zsh_history
+/[A-Z]*
+Thumbs.db
diff --git a/.tmux.conf b/.tmux.conf
index e7d2a10..7ddc9b1 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -24,12 +24,12 @@ set -g base-index 1
 
 # other settings
 setw -g mode-keys vi
-set -g repeat-time 1500
+set -g repeat-time 1000
 set-option -g mouse on
 
 # navigating windows
-bind \ split-window -h
-bind - split-window -v
+bind \ split-window -h -c "#{pane_current_path}"
+bind - split-window -v -c "#{pane_current_path}"
 
 bind M-1 select-window -t 1
 bind -r o select-window -t :-
diff --git a/.vimrc b/.vimrc
index 005e73d..d842805 100644
--- a/.vimrc
+++ b/.vimrc
@@ -31,8 +31,8 @@ se backspace=indent,eol,start " allow backspacing over everything in insert mode
 se scrolloff=6                " keep 4 lines of context when scrolling
 set showbreak=↪
 
-se foldmethod=syntax
-se nofoldenable
+" se foldmethod=syntax
+" se nofoldenable
 
 se incsearch                  " do incremental search
 se hlsearch                   " highlight search results
diff --git a/.zsh/aliases.zsh b/.zsh/aliases.zsh
index 5277928..1a3cc56 100644
--- a/.zsh/aliases.zsh
+++ b/.zsh/aliases.zsh
@@ -20,4 +20,4 @@ alias brake='bundle exec rake'
 alias birb='bundle exec irb'
 
 alias git=hub
-
+alias pt=papertrail
diff --git a/.zsh/exports.zsh b/.zsh/exports.zsh
index 1efc6f3..bbe20db 100644
--- a/.zsh/exports.zsh
+++ b/.zsh/exports.zsh
@@ -11,6 +11,7 @@ export PATH="$PATH:$HOME/.tmux/bin"
 export PATH="$PATH:$HOME/Development/projects/travis/travis-enterprise/build/bin"
 export PATH="$PATH:$HOME/Development/go/bin"
 export PATH="$PATH:$HOME/Development/go/src/github.com/svenfuchs/todo"
+export PATH="$PATH:/usr/local/packer:/usr/local/terraform"
 export PATH="$PATH:/usr/local/heroku/bin" # Added by the Heroku Toolbelt
 
 # export PATH="$PATH:/Users/sven/Applications/bin"