commit 3c7b6150b953a8052dc69c46e461b574d6067a52
Author: AdeAttwood <attwood16:googlemail.com>
Date:   Sun May 22 08:53:37 2016 +0100

    First Commit

diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..45e1289
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,66 @@
+[submodule "dotfiles/vim/bundle/auto-pairs"]
+	path = dotfiles/vim/bundle/auto-pairs
+	url = git://github.com/jiangmiao/auto-pairs.git
+[submodule "dotfiles/vim/bundle/browserlink.vim"]
+	path = dotfiles/vim/bundle/browserlink.vim
+	url = git://github.com/jaxbot/browserlink.vim.git
+[submodule "dotfiles/vim/bundle/calendar.vim"]
+	path = dotfiles/vim/bundle/calendar.vim
+	url = https://github.com/itchyny/calendar.vim
+[submodule "dotfiles/vim/bundle/ctrlp.vim"]
+	path = dotfiles/vim/bundle/ctrlp.vim
+	url = https://github.com/kien/ctrlp.vim.git
+[submodule "dotfiles/vim/bundle/indentLine"]
+	path = dotfiles/vim/bundle/indentLine
+	url = https://github.com/Yggdroot/indentLine.git
+[submodule "dotfiles/vim/bundle/nerdcommenter"]
+	path = dotfiles/vim/bundle/nerdcommenter
+	url = https://github.com/scrooloose/nerdcommenter.git
+[submodule "dotfiles/vim/bundle/nerdtree"]
+	path = dotfiles/vim/bundle/nerdtree
+	url = https://github.com/scrooloose/nerdtree.git
+[submodule "dotfiles/vim/bundle/pdv"]
+	path = dotfiles/vim/bundle/pdv
+	url = https://github.com/tobyS/pdv.git
+[submodule "dotfiles/vim/bundle/sparkup"]
+	path = dotfiles/vim/bundle/sparkup
+	url = https://github.com/rstacruz/sparkup.git
+[submodule "dotfiles/vim/bundle/unite.vim"]
+	path = dotfiles/vim/bundle/unite.vim
+	url = https://github.com/Shougo/unite.vim.git
+[submodule "dotfiles/vim/bundle/vdebug"]
+	path = dotfiles/vim/bundle/vdebug
+	url = https://github.com/joonty/vdebug.git
+[submodule "dotfiles/vim/bundle/vim-airline"]
+	path = dotfiles/vim/bundle/vim-airline
+	url = https://github.com/vim-airline/vim-airline
+[submodule "dotfiles/vim/bundle/vim-easy-align"]
+	path = dotfiles/vim/bundle/vim-easy-align
+	url = https://github.com/junegunn/vim-easy-align.git
+[submodule "dotfiles/vim/bundle/vim-fugitive"]
+	path = dotfiles/vim/bundle/vim-fugitive
+	url = git://github.com/tpope/vim-fugitive.git
+[submodule "dotfiles/vim/bundle/vim-gitgutter"]
+	path = dotfiles/vim/bundle/vim-gitgutter
+	url = git://github.com/airblade/vim-gitgutter.git
+[submodule "dotfiles/vim/bundle/vim-grammarous"]
+	path = dotfiles/vim/bundle/vim-grammarous
+	url = https://github.com/rhysd/vim-grammarous.git
+[submodule "dotfiles/vim/bundle/vim-indent-guides"]
+	path = dotfiles/vim/bundle/vim-indent-guides
+	url = git://github.com/nathanaelkane/vim-indent-guides.git
+[submodule "dotfiles/vim/bundle/vim-multiple-cursors"]
+	path = dotfiles/vim/bundle/vim-multiple-cursors
+	url = https://github.com/terryma/vim-multiple-cursors.git
+[submodule "dotfiles/vim/bundle/vim-surround"]
+	path = dotfiles/vim/bundle/vim-surround
+	url = git://github.com/tpope/vim-surround.git
+[submodule "dotfiles/vim/bundle/vim-tmux-navigator"]
+	path = dotfiles/vim/bundle/vim-tmux-navigator
+	url = https://github.com/christoomey/vim-tmux-navigator.git
+[submodule "dotfiles/vim/bundle/vimwiki"]
+	path = dotfiles/vim/bundle/vimwiki
+	url = https://github.com/vimwiki/vimwiki.git
+[submodule "dotfiles/vim/bundle/vmustache"]
+	path = dotfiles/vim/bundle/vmustache
+	url = https://github.com/tobyS/vmustache.git
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8f8843a
--- /dev/null
+++ b/README.md
@@ -0,0 +1,4 @@
+Install
+
+git clone https://github.com/AdeAttwood/Dotfiles.git ~/.dotfiles
+
diff --git a/dotfiles/Xresources b/dotfiles/Xresources
new file mode 100644
index 0000000..9899c1a
--- /dev/null
+++ b/dotfiles/Xresources
@@ -0,0 +1,70 @@
+!xrdb -merge ~/.Xresources
+! Use a nice truetype font and size by default... 
+xterm*faceName: DejaVu Sans Mono Book
+!xterm*faceSize: 11
+xterm*faceSize: 10
+
+! Every shell is a login shell by default (for inclusion of all necessary environment variables)
+xterm*loginshell: true
+
+! I like a LOT of scrollback...
+xterm*savelines: 16384
+
+! double-click to select whole URLs :D
+xterm*charClass: 33:48,36-47:48,58-59:48,61:48,63-64:48,95:48,126:48
+
+
+
+! DOS-box colours...
+
+
+! right hand side scrollbar...
+xterm*rightScrollBar: true
+xterm*ScrollBar: true
+
+! stop output to terminal from jumping down to bottom of scroll again
+xterm*scrollTtyOutput: false
+
+#define S_base03        #002b36
+#define S_base02        #073642
+#define S_base01        #586e75
+#define S_base00        #657b83
+#define S_base0         #839496
+#define S_base1         #93a1a1
+#define S_base2         #eee8d5
+#define S_base3         #fdf6e3
+
+*background:            S_base03
+*foreground:            S_base0
+*fadeColor:             S_base03
+*cursorColor:           S_base1
+*pointerColorBackground:S_base01
+*pointerColorForeground:S_base1
+
+#define S_yellow        #b58900
+#define S_orange        #cb4b16
+#define S_red           #dc322f
+#define S_magenta       #d33682
+#define S_violet        #6c71c4
+#define S_blue          #268bd2
+#define S_cyan          #2aa198
+#define S_green         #859900
+
+xterm*foreground: S_base0
+xterm*background: S_base03
+xterm*color0: S_base02
+xterm*color1: S_red
+xterm*color2: S_green
+xterm*color3: S_yellow
+xterm*color4: S_blue
+xterm*color5: S_magenta
+xterm*color6: S_cyan
+xterm*color7: S_base2
+xterm*color8: S_base03
+xterm*color9: S_orange
+xterm*color10: S_base01
+xterm*color11: S_base00
+xterm*color12: S_base0
+xterm*color13: S_violet
+xterm*color14: S_base1
+xterm*color15: S_base3
diff --git a/dotfiles/bashrc b/dotfiles/bashrc
new file mode 100644
index 0000000..4340756
--- /dev/null
+++ b/dotfiles/bashrc
@@ -0,0 +1,120 @@
+# costume user bin dir
+export PATH=$PATH:~/.composer/vendor/bin
+
+# ~/.bashrc: executed by bash(1) for non-login shells.
+# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
+# for examples
+
+# If not running interactively, don't do anything
+case $- in
+    *i*) ;;
+      *) return;;
+esac
+
+# don't put duplicate lines or lines starting with space in the history.
+# See bash(1) for more options
+HISTCONTROL=ignoreboth
+
+# append to the history file, don't overwrite it
+shopt -s histappend
+
+# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
+HISTSIZE=1000
+HISTFILESIZE=2000
+
+# check the window size after each command and, if necessary,
+# update the values of LINES and COLUMNS.
+shopt -s checkwinsize
+
+# If set, the pattern "**" used in a pathname expansion context will
+# match all files and zero or more directories and subdirectories.
+#shopt -s globstar
+
+# make less more friendly for non-text input files, see lesspipe(1)
+[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
+
+# set variable identifying the chroot you work in (used in the prompt below)
+if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
+    debian_chroot=$(cat /etc/debian_chroot)
+fi
+
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    alias grep='grep --color=auto'
+    alias fgrep='fgrep --color=auto'
+    alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
+
+# some more ls aliases
+alias ll='ls -alF'
+alias la='ls -A'
+alias l='ls -CF'
+
+# Add an "alert" alias for long running commands.  Use like so:
+#   sleep 10; alert
+alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+
+# Alias definitions.
+# You may want to put all your additions into a separate file like
+# ~/.bash_aliases, instead of adding them here directly.
+# See /usr/share/doc/bash-doc/examples in the bash-doc package.
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
+
+# enable programmable completion features (you don't need to enable
+# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
+# sources /etc/bash.bashrc).
+if ! shopt -oq posix; then
+  if [ -f /usr/share/bash-completion/bash_completion ]; then
+    . /usr/share/bash-completion/bash_completion
+  elif [ -f /etc/bash_completion ]; then
+    . /etc/bash_completion
+  fi
+fi
diff --git a/dotfiles/composer/composer.json b/dotfiles/composer/composer.json
new file mode 100644
index 0000000..955590b
--- /dev/null
+++ b/dotfiles/composer/composer.json
@@ -0,0 +1,5 @@
+{
+    "require": {
+        "phpunit/phpunit": "^5.3"
+    }
+}
diff --git a/dotfiles/tmux.conf b/dotfiles/tmux.conf
new file mode 100644
index 0000000..ef5fff7
--- /dev/null
+++ b/dotfiles/tmux.conf
@@ -0,0 +1,28 @@
+# split windows like vim
+# vim's definition of a horizontal/vertical split is reversed from tmux's
+bind s split-window -v
+bind v split-window -h
+
+# Smart pane switching with awareness of vim splits
+# See: https://github.com/christoomey/vim-tmux-navigator
+is_vim='echo "#{pane_current_command}" | grep -iqE "(^|\/)g?(view|n?vim?x?)(diff)?$"'
+bind -n C-h if-shell "$is_vim" "send-keys C-h" "select-pane -L"
+bind -n C-j if-shell "$is_vim" "send-keys C-j" "select-pane -D"
+bind -n C-k if-shell "$is_vim" "send-keys C-k" "select-pane -U"
+bind -n C-l if-shell "$is_vim" "send-keys C-l" "select-pane -R"
+bind -n C-\ if-shell "$is_vim" "send-keys C-\\" "select-pane -l"
+
+# resize panes like vim
+# feel free to change the "1" to however many lines you want to resize by, only
+# one at a time can be slow
+bind < resize-pane -L 1
+bind > resize-pane -R 1
+bind - resize-pane -D 1
+bind + resize-pane -U 1
+
+# bind : to command-prompt like vim
+# this is the default in tmux already
+bind : command-prompt
+
+# vi-style controls for copy mode
+setw -g mode-keys vi
diff --git a/dotfiles/tmuxinator/fullScreenDev.yml b/dotfiles/tmuxinator/fullScreenDev.yml
new file mode 100644
index 0000000..a01bf73
--- /dev/null
+++ b/dotfiles/tmuxinator/fullScreenDev.yml
@@ -0,0 +1,36 @@
+# ~/.tmuxinator/fullScreenDev.yml
+
+name: fullScreenDev
+root: <%= @args[0] %>
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used.
+# startup_window: logs
+
+# Controls whether the tmux session should be attached to automatically. Defaults to true.
+# attach: false
+
+# Runs after everything. Use it to attach to tmux with custom options etc.
+# post: tmux -CC attach -t myLaravel
+
+windows:
+  - editor:
+      layout: a989,283x58,0,0{212x58,0,0,0,70x58,213,0[70x29,213,0,1,70x28,213,30,2]}
+      panes:
+        - vim --servername vim
+        - vifm
+        - 
diff --git a/dotfiles/tmuxinator/rails.yml b/dotfiles/tmuxinator/rails.yml
new file mode 100644
index 0000000..b387ffc
--- /dev/null
+++ b/dotfiles/tmuxinator/rails.yml
@@ -0,0 +1,37 @@
+# ~/.tmuxinator/rails.yml
+
+name: rails
+root: <%= @args[0] %>
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used.
+# startup_window: logs
+
+# Controls whether the tmux session should be attached to automatically. Defaults to true.
+# attach: false
+
+# Runs after everything. Use it to attach to tmux with custom options etc.
+# post: tmux -CC attach -t rails
+
+windows:
+  - editor:
+      layout: 2178,136x55,0,0[136x45,0,0,0,136x9,0,46,4]
+      panes:
+        - vim
+        - 
+  - git: 
+  - server: rails s 
diff --git a/dotfiles/tmuxinator/webDev.yml b/dotfiles/tmuxinator/webDev.yml
new file mode 100644
index 0000000..c44e6b4
--- /dev/null
+++ b/dotfiles/tmuxinator/webDev.yml
@@ -0,0 +1,38 @@
+# ~/.tmuxinator/webDev.yml
+
+name: webDev
+root: <%= @args[0] %>
+
+# Optional tmux socket
+# socket_name: foo
+
+# Runs before everything. Use it to start daemons etc.
+# pre: sudo /etc/rc.d/mysqld start
+
+# Runs in each window and pane before window/pane specific commands. Useful for setting up interpreter versions.
+# pre_window: rbenv shell 2.0.0-p247
+
+# Pass command line options to tmux. Useful for specifying a different tmux.conf.
+# tmux_options: -f ~/.tmux.mac.conf
+
+# Change the command to call tmux.  This can be used by derivatives/wrappers like byobu.
+# tmux_command: byobu
+
+# Specifies (by name or index) which window will be selected on project startup. If not set, the first window is used.
+# startup_window: logs
+
+# Controls whether the tmux session should be attached to automatically. Defaults to true.
+# attach: false
+
+# Runs after everything. Use it to attach to tmux with custom options etc.
+# post: tmux -CC attach -t webDev
+
+windows:
+  - editor:
+      layout: 2178,136x55,0,0[136x45,0,0,0,136x9,0,46,4]
+      panes:
+        - vim
+        - 
+  - git: 
+  - browser: google-chrome http://localhost
+  - Tasks: 
diff --git a/dotfiles/vim/autoload/pathogen.vim b/dotfiles/vim/autoload/pathogen.vim
new file mode 100644
index 0000000..59a75c1
--- /dev/null
+++ b/dotfiles/vim/autoload/pathogen.vim
@@ -0,0 +1,353 @@
+" pathogen.vim - path option manipulation
+" Maintainer:   Tim Pope <http://tpo.pe/>
+" Version:      2.4
+
+" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
+"
+" For management of individually installed plugins in ~/.vim/bundle (or
+" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
+" .vimrc is the only other setup necessary.
+"
+" The API is documented inline below.
+
+if exists("g:loaded_pathogen") || &cp
+  finish
+endif
+let g:loaded_pathogen = 1
+
+" Point of entry for basic default usage.  Give a relative path to invoke
+" pathogen#interpose() (defaults to "bundle/{}"), or an absolute path to invoke
+" pathogen#surround().  Curly braces are expanded with pathogen#expand():
+" "bundle/{}" finds all subdirectories inside "bundle" inside all directories
+" in the runtime path.
+function! pathogen#infect(...) abort
+  for path in a:0 ? filter(reverse(copy(a:000)), 'type(v:val) == type("")') : ['bundle/{}']
+    if path =~# '^\%({\=[$~\\/]\|{\=\w:[\\/]\).*[{}*]'
+      call pathogen#surround(path)
+    elseif path =~# '^\%([$~\\/]\|\w:[\\/]\)'
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#surround(path . '/{}')
+    elseif path =~# '[{}*]'
+      call pathogen#interpose(path)
+    else
+      call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
+      call pathogen#interpose(path . '/{}')
+    endif
+  endfor
+  call pathogen#cycle_filetype()
+  if pathogen#is_disabled($MYVIMRC)
+    return 'finish'
+  endif
+  return ''
+endfunction
+
+" Split a path into a list.
+function! pathogen#split(path) abort
+  if type(a:path) == type([]) | return a:path | endif
+  if empty(a:path) | return [] | endif
+  let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
+  return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
+endfunction
+
+" Convert a list to a path.
+function! pathogen#join(...) abort
+  if type(a:1) == type(1) && a:1
+    let i = 1
+    let space = ' '
+  else
+    let i = 0
+    let space = ''
+  endif
+  let path = ""
+  while i < a:0
+    if type(a:000[i]) == type([])
+      let list = a:000[i]
+      let j = 0
+      while j < len(list)
+        let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
+        let path .= ',' . escaped
+        let j += 1
+      endwhile
+    else
+      let path .= "," . a:000[i]
+    endif
+    let i += 1
+  endwhile
+  return substitute(path,'^,','','')
+endfunction
+
+" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
+function! pathogen#legacyjoin(...) abort
+  return call('pathogen#join',[1] + a:000)
+endfunction
+
+" Turn filetype detection off and back on again if it was already enabled.
+function! pathogen#cycle_filetype() abort
+  if exists('g:did_load_filetypes')
+    filetype off
+    filetype on
+  endif
+endfunction
+
+" Check if a bundle is disabled.  A bundle is considered disabled if its
+" basename or full name is included in the list g:pathogen_blacklist or the
+" comma delimited environment variable $VIMBLACKLIST.
+function! pathogen#is_disabled(path) abort
+  if a:path =~# '\~$'
+    return 1
+  endif
+  let sep = pathogen#slash()
+  let blacklist =
+        \ get(g:, 'pathogen_blacklist', get(g:, 'pathogen_disabled', [])) +
+        \ pathogen#split($VIMBLACKLIST)
+  if !empty(blacklist)
+    call map(blacklist, 'substitute(v:val, "[\\/]$", "", "")')
+  endif
+  return index(blacklist, fnamemodify(a:path, ':t')) != -1 || index(blacklist, a:path) != -1
+endfunction
+
+" Prepend the given directory to the runtime path and append its corresponding
+" after directory.  Curly braces are expanded with pathogen#expand().
+function! pathogen#surround(path) abort
+  let sep = pathogen#slash()
+  let rtp = pathogen#split(&rtp)
+  let path = fnamemodify(a:path, ':s?[\\/]\=$??')
+  let before = filter(pathogen#expand(path), '!pathogen#is_disabled(v:val)')
+  let after = filter(reverse(pathogen#expand(path, sep.'after')), '!pathogen#is_disabled(v:val[0:-7])')
+  call filter(rtp, 'index(before + after, v:val) == -1')
+  let &rtp = pathogen#join(before, rtp, after)
+  return &rtp
+endfunction
+
+" For each directory in the runtime path, add a second entry with the given
+" argument appended.  Curly braces are expanded with pathogen#expand().
+function! pathogen#interpose(name) abort
+  let sep = pathogen#slash()
+  let name = a:name
+  if has_key(s:done_bundles, name)
+    return ""
+  endif
+  let s:done_bundles[name] = 1
+  let list = []
+  for dir in pathogen#split(&rtp)
+    if dir =~# '\<after$'
+      let list += reverse(filter(pathogen#expand(dir[0:-6].name, sep.'after'), '!pathogen#is_disabled(v:val[0:-7])')) + [dir]
+    else
+      let list += [dir] + filter(pathogen#expand(dir.sep.name), '!pathogen#is_disabled(v:val)')
+    endif
+  endfor
+  let &rtp = pathogen#join(pathogen#uniq(list))
+  return 1
+endfunction
+
+let s:done_bundles = {}
+
+" Invoke :helptags on all non-$VIM doc directories in runtimepath.
+function! pathogen#helptags() abort
+  let sep = pathogen#slash()
+  for glob in pathogen#split(&rtp)
+    for dir in map(split(glob(glob), "\n"), 'v:val.sep."/doc/".sep')
+      if (dir)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir) == 2 && !empty(split(glob(dir.'*.txt'))) && (!filereadable(dir.'tags') || filewritable(dir.'tags'))
+        silent! execute 'helptags' pathogen#fnameescape(dir)
+      endif
+    endfor
+  endfor
+endfunction
+
+command! -bar Helptags :call pathogen#helptags()
+
+" Execute the given command.  This is basically a backdoor for --remote-expr.
+function! pathogen#execute(...) abort
+  for command in a:000
+    execute command
+  endfor
+  return ''
+endfunction
+
+" Section: Unofficial
+
+function! pathogen#is_absolute(path) abort
+  return a:path =~# (has('win32') ? '^\%([\\/]\|\w:\)[\\/]\|^[~$]' : '^[/~$]')
+endfunction
+
+" Given a string, returns all possible permutations of comma delimited braced
+" alternatives of that string.  pathogen#expand('/{a,b}/{c,d}') yields
+" ['/a/c', '/a/d', '/b/c', '/b/d'].  Empty braces are treated as a wildcard
+" and globbed.  Actual globs are preserved.
+function! pathogen#expand(pattern, ...) abort
+  let after = a:0 ? a:1 : ''
+  if a:pattern =~# '{[^{}]\+}'
+    let [pre, pat, post] = split(substitute(a:pattern, '\(.\{-\}\){\([^{}]\+\)}\(.*\)', "\\1\001\\2\001\\3", ''), "\001", 1)
+    let found = map(split(pat, ',', 1), 'pre.v:val.post')
+    let results = []
+    for pattern in found
+      call extend(results, pathogen#expand(pattern))
+    endfor
+  elseif a:pattern =~# '{}'
+    let pat = matchstr(a:pattern, '^.*{}[^*]*\%($\|[\\/]\)')
+    let post = a:pattern[strlen(pat) : -1]
+    let results = map(split(glob(substitute(pat, '{}', '*', 'g')), "\n"), 'v:val.post')
+  else
+    let results = [a:pattern]
+  endif
+  let vf = pathogen#slash() . 'vimfiles'
+  call map(results, 'v:val =~# "\\*" ? v:val.after : isdirectory(v:val.vf.after) ? v:val.vf.after : isdirectory(v:val.after) ? v:val.after : ""')
+  return filter(results, '!empty(v:val)')
+endfunction
+
+" \ on Windows unless shellslash is set, / everywhere else.
+function! pathogen#slash() abort
+  return !exists("+shellslash") || &shellslash ? '/' : '\'
+endfunction
+
+function! pathogen#separator() abort
+  return pathogen#slash()
+endfunction
+
+" Convenience wrapper around glob() which returns a list.
+function! pathogen#glob(pattern) abort
+  let files = split(glob(a:pattern),"\n")
+  return map(files,'substitute(v:val,"[".pathogen#slash()."/]$","","")')
+endfunction
+
+" Like pathogen#glob(), only limit the results to directories.
+function! pathogen#glob_directories(pattern) abort
+  return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
+endfunction
+
+" Remove duplicates from a list.
+function! pathogen#uniq(list) abort
+  let i = 0
+  let seen = {}
+  while i < len(a:list)
+    if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
+      call remove(a:list,i)
+    elseif a:list[i] ==# ''
+      let i += 1
+      let empty = 1
+    else
+      let seen[a:list[i]] = 1
+      let i += 1
+    endif
+  endwhile
+  return a:list
+endfunction
+
+" Backport of fnameescape().
+function! pathogen#fnameescape(string) abort
+  if exists('*fnameescape')
+    return fnameescape(a:string)
+  elseif a:string ==# '-'
+    return '\-'
+  else
+    return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
+  endif
+endfunction
+
+" Like findfile(), but hardcoded to use the runtimepath.
+function! pathogen#runtime_findfile(file,count) abort
+  let rtp = pathogen#join(1,pathogen#split(&rtp))
+  let file = findfile(a:file,rtp,a:count)
+  if file ==# ''
+    return ''
+  else
+    return fnamemodify(file,':p')
+  endif
+endfunction
+
+" Section: Deprecated
+
+function! s:warn(msg) abort
+  echohl WarningMsg
+  echomsg a:msg
+  echohl NONE
+endfunction
+
+" Prepend all subdirectories of path to the rtp, and append all 'after'
+" directories in those subdirectories.  Deprecated.
+function! pathogen#runtime_prepend_subdirectories(path) abort
+  call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#infect('.string(a:path.'/{}').')')
+  return pathogen#surround(a:path . pathogen#slash() . '{}')
+endfunction
+
+function! pathogen#incubate(...) abort
+  let name = a:0 ? a:1 : 'bundle/{}'
+  call s:warn('Change pathogen#incubate('.(a:0 ? string(a:1) : '').') to pathogen#infect('.string(name).')')
+  return pathogen#interpose(name)
+endfunction
+
+" Deprecated alias for pathogen#interpose().
+function! pathogen#runtime_append_all_bundles(...) abort
+  if a:0
+    call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#infect('.string(a:1.'/{}').')')
+  else
+    call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#infect()')
+  endif
+  return pathogen#interpose(a:0 ? a:1 . '/{}' : 'bundle/{}')
+endfunction
+
+if exists(':Vedit')
+  finish
+endif
+
+let s:vopen_warning = 0
+
+function! s:find(count,cmd,file,lcd)
+  let rtp = pathogen#join(1,pathogen#split(&runtimepath))
+  let file = pathogen#runtime_findfile(a:file,a:count)
+  if file ==# ''
+    return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
+  endif
+  if !s:vopen_warning
+    let s:vopen_warning = 1
+    let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
+  else
+    let warning = ''
+  endif
+  if a:lcd
+    let path = file[0:-strlen(a:file)-2]
+    execute 'lcd `=path`'
+    return a:cmd.' '.pathogen#fnameescape(a:file) . warning
+  else
+    return a:cmd.' '.pathogen#fnameescape(file) . warning
+  endif
+endfunction
+
+function! s:Findcomplete(A,L,P)
+  let sep = pathogen#slash()
+  let cheats = {
+        \'a': 'autoload',
+        \'d': 'doc',
+        \'f': 'ftplugin',
+        \'i': 'indent',
+        \'p': 'plugin',
+        \'s': 'syntax'}
+  if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
+    let request = cheats[a:A[0]].a:A[1:-1]
+  else
+    let request = a:A
+  endif
+  let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
+  let found = {}
+  for path in pathogen#split(&runtimepath)
+    let path = expand(path, ':p')
+    let matches = split(glob(path.sep.pattern),"\n")
+    call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
+    call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
+    for match in matches
+      let found[match] = 1
+    endfor
+  endfor
+  return sort(keys(found))
+endfunction
+
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve       :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit    :execute s:find(<count>,'edit<bang>',<q-args>,0)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen    :execute s:find(<count>,'edit<bang>',<q-args>,1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit   :execute s:find(<count>,'split',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit  :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit   :execute s:find(<count>,'pedit',<q-args>,<bang>1)
+command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread    :execute s:find(<count>,'read',<q-args>,<bang>1)
+
+" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=':
diff --git a/dotfiles/vim/bundle/auto-pairs b/dotfiles/vim/bundle/auto-pairs
new file mode 160000
index 0000000..5979999
--- /dev/null
+++ b/dotfiles/vim/bundle/auto-pairs
@@ -0,0 +1 @@
+Subproject commit 5979999a17c7330abfe1d73fd3c8d72f09d77334
diff --git a/dotfiles/vim/bundle/browserlink.vim b/dotfiles/vim/bundle/browserlink.vim
new file mode 160000
index 0000000..ccb6b3f
--- /dev/null
+++ b/dotfiles/vim/bundle/browserlink.vim
@@ -0,0 +1 @@
+Subproject commit ccb6b3f0b87a18f0406353b4972c93925b597df7
diff --git a/dotfiles/vim/bundle/calendar.vim b/dotfiles/vim/bundle/calendar.vim
new file mode 160000
index 0000000..f49bd33
--- /dev/null
+++ b/dotfiles/vim/bundle/calendar.vim
@@ -0,0 +1 @@
+Subproject commit f49bd337a4643bb58df0fa4df230d60bdfeef022
diff --git a/dotfiles/vim/bundle/ctrlp.vim b/dotfiles/vim/bundle/ctrlp.vim
new file mode 160000
index 0000000..564176f
--- /dev/null
+++ b/dotfiles/vim/bundle/ctrlp.vim
@@ -0,0 +1 @@
+Subproject commit 564176f01d7f3f7f8ab452ff4e1f5314de7b0981
diff --git a/dotfiles/vim/bundle/indentLine b/dotfiles/vim/bundle/indentLine
new file mode 160000
index 0000000..2a26173
--- /dev/null
+++ b/dotfiles/vim/bundle/indentLine
@@ -0,0 +1 @@
+Subproject commit 2a2617310b0fb4c0daf02be2ba465fada257f2d0
diff --git a/dotfiles/vim/bundle/nerdcommenter b/dotfiles/vim/bundle/nerdcommenter
new file mode 160000
index 0000000..1f4bfd5
--- /dev/null
+++ b/dotfiles/vim/bundle/nerdcommenter
@@ -0,0 +1 @@
+Subproject commit 1f4bfd59920c101a30a74a07b824608a6e65f3fe
diff --git a/dotfiles/vim/bundle/nerdtree b/dotfiles/vim/bundle/nerdtree
new file mode 160000
index 0000000..15445be
--- /dev/null
+++ b/dotfiles/vim/bundle/nerdtree
@@ -0,0 +1 @@
+Subproject commit 15445be5fb2559829ac7a1f05af5d713586e8ec9
diff --git a/dotfiles/vim/bundle/pdv b/dotfiles/vim/bundle/pdv
new file mode 160000
index 0000000..0e4b5aa
--- /dev/null
+++ b/dotfiles/vim/bundle/pdv
@@ -0,0 +1 @@
+Subproject commit 0e4b5aa689400246069953147ce53905c912087d
diff --git a/dotfiles/vim/bundle/sparkup b/dotfiles/vim/bundle/sparkup
new file mode 160000
index 0000000..d400a57
--- /dev/null
+++ b/dotfiles/vim/bundle/sparkup
@@ -0,0 +1 @@
+Subproject commit d400a570bf64b0c216aa7c8e1795820b911a7404
diff --git a/dotfiles/vim/bundle/unite.vim b/dotfiles/vim/bundle/unite.vim
new file mode 160000
index 0000000..5fd81fe
--- /dev/null
+++ b/dotfiles/vim/bundle/unite.vim
@@ -0,0 +1 @@
+Subproject commit 5fd81feec7ff3f94173ecb10e3dee98aaef26e5d
diff --git a/dotfiles/vim/bundle/vdebug b/dotfiles/vim/bundle/vdebug
new file mode 160000
index 0000000..24495d1
--- /dev/null
+++ b/dotfiles/vim/bundle/vdebug
@@ -0,0 +1 @@
+Subproject commit 24495d14a7af9b7c707c5ca5e0b30d28eb024df1
diff --git a/dotfiles/vim/bundle/vim-airline b/dotfiles/vim/bundle/vim-airline
new file mode 160000
index 0000000..70c16f4
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-airline
@@ -0,0 +1 @@
+Subproject commit 70c16f4c46f11395bbbc30b2f0a6822669e7df87
diff --git a/dotfiles/vim/bundle/vim-easy-align b/dotfiles/vim/bundle/vim-easy-align
new file mode 160000
index 0000000..0cb6b98
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-easy-align
@@ -0,0 +1 @@
+Subproject commit 0cb6b98fc155717b0a56c110551ac57d1d951ddb
diff --git a/dotfiles/vim/bundle/vim-fugitive b/dotfiles/vim/bundle/vim-fugitive
new file mode 160000
index 0000000..3439f99
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-fugitive
@@ -0,0 +1 @@
+Subproject commit 3439f999b138254e4bb56187fc91f91f545b4b12
diff --git a/dotfiles/vim/bundle/vim-gitgutter b/dotfiles/vim/bundle/vim-gitgutter
new file mode 160000
index 0000000..377c71d
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-gitgutter
@@ -0,0 +1 @@
+Subproject commit 377c71d9823be32c021a597d8d18c3234ed567c1
diff --git a/dotfiles/vim/bundle/vim-grammarous b/dotfiles/vim/bundle/vim-grammarous
new file mode 160000
index 0000000..f9bbf94
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-grammarous
@@ -0,0 +1 @@
+Subproject commit f9bbf94e9a89fd6bd69aef6f372a3f66a2bc3be7
diff --git a/dotfiles/vim/bundle/vim-indent-guides b/dotfiles/vim/bundle/vim-indent-guides
new file mode 160000
index 0000000..018298e
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-indent-guides
@@ -0,0 +1 @@
+Subproject commit 018298ead9d3aa9cd3b4ae222f81022a33978b09
diff --git a/dotfiles/vim/bundle/vim-multiple-cursors b/dotfiles/vim/bundle/vim-multiple-cursors
new file mode 160000
index 0000000..25b567b
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-multiple-cursors
@@ -0,0 +1 @@
+Subproject commit 25b567baf712a7e9bc8f3c9ca816bd579363109b
diff --git a/dotfiles/vim/bundle/vim-surround b/dotfiles/vim/bundle/vim-surround
new file mode 160000
index 0000000..2d05440
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-surround
@@ -0,0 +1 @@
+Subproject commit 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c
diff --git a/dotfiles/vim/bundle/vim-tmux-navigator b/dotfiles/vim/bundle/vim-tmux-navigator
new file mode 160000
index 0000000..e13914d
--- /dev/null
+++ b/dotfiles/vim/bundle/vim-tmux-navigator
@@ -0,0 +1 @@
+Subproject commit e13914d89e9413cfa449f0c3daff18691356f2d1
diff --git a/dotfiles/vim/bundle/vimwiki b/dotfiles/vim/bundle/vimwiki
new file mode 160000
index 0000000..4831384
--- /dev/null
+++ b/dotfiles/vim/bundle/vimwiki
@@ -0,0 +1 @@
+Subproject commit 4831384ab9f1c40c9e433857d958c4d9a7beb8ec
diff --git a/dotfiles/vim/bundle/vmustache b/dotfiles/vim/bundle/vmustache
new file mode 160000
index 0000000..d39f77b
--- /dev/null
+++ b/dotfiles/vim/bundle/vmustache
@@ -0,0 +1 @@
+Subproject commit d39f77bafef57ba7af304c74b3cfc91a83fd86e0
diff --git a/dotfiles/vimrc b/dotfiles/vimrc
new file mode 100644
index 0000000..4da08c0
--- /dev/null
+++ b/dotfiles/vimrc
@@ -0,0 +1,165 @@
+" --------------------------------------------------------------------------------
+" important
+" --------------------------------------------------------------------------------
+call pathogen#infect()
+set nocompatible
+set runtimepath^=~/.vim/bundle/ctrlp.vim
+" --------------------------------------------------------------------------------
+" not sorted
+" --------------------------------------------------------------------------------
+let g:airline#extensions#branch#enabled=1
+
+set t_Co=256
+set fileencoding=utf-8
+set encoding=utf-8
+set title
+set autoread
+set matchpairs+=<:>
+set ruler
+set showcmd
+set cursorline
+
+
+let g:pdv_template_dir = $HOME ."/.vim/bundle/pdv/templates_snip"
+let g:indent_guides_auto_colors = 1
+"autocmd VimEnter,Colorscheme * :hi IndentGuidesOdd  guibg=red   ctermbg=3
+"autocmd VimEnter,Colorscheme * :hi IndentGuidesEven guibg=green ctermbg=4
+" --------------------------------------------------------------------------------
+" moving around, searching and patterns
+" --------------------------------------------------------------------------------
+set showmatch
+set incsearch
+set hlsearch
+" --------------------------------------------------------------------------------
+" tags
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" displaying text
+" --------------------------------------------------------------------------------
+set linebreak
+" --------------------------------------------------------------------------------
+" highlighting and spelling
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" multiple windows
+" --------------------------------------------------------------------------------
+set laststatus=2
+" --------------------------------------------------------------------------------
+" multiple tab pages
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" terminal
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" using the mouse
+" --------------------------------------------------------------------------------
+set mouse=a
+" --------------------------------------------------------------------------------
+" printing
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" messages and info
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" selecting text
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" editing text
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" tabs and indenting
+" --------------------------------------------------------------------------------
+set tabstop=4
+set shiftwidth=4
+set expandtab 
+set autoindent
+filetype plugin indent on
+" --------------------------------------------------------------------------------
+" folding
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" diff mode
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" mapping
+" --------------------------------------------------------------------------------
+inoremap EE <esc>$a
+inoremap ;;  <esc>$a;
+inoremap jj <esc>:w<cr>
+nnoremap <Leader>p :set paste<CR>o<esc>"*]p:set nopaste<cr>"
+nmap <silent> <Leader>o :NERDTreeToggle<CR>
+nmap <silent> <Leader>s ]sz=
+nmap <Leader>r :BLReloadPage<cr>
+nnoremap <silent> <Right> :vertical resize +5<cr>
+noremap <silent> <Left> :vertical resize -5<cr>
+nnoremap <silent> <Up> :resize +5<cr>
+nnoremap <silent> <Down> :resize -5<cr>
+nnoremap <leader>d :call pdv#DocumentWithSnip()<cr>
+nnoremap <leader>t :! vendor/bin/phpunit<cr>
+nnoremap <leader>tf :! vendor/bin/phpunit %<cr>
+" --------------------------------------------------------------------------------
+" reading and writing files
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" the swap file
+" --------------------------------------------------------------------------------
+set noswapfile
+" --------------------------------------------------------------------------------
+" command line editing
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" executing external commands
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" running make and jumping to errors
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" language specific
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" multi-byte characters
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+" variousexecute 
+" --------------------------------------------------------------------------------
+" --------------------------------------------------------------------------------
+"  functions
+" --------------------------------------------------------------------------------
+set rnu
+function! ToggleNumbersOn()
+	set nu!
+	set rnu
+endfunction
+function! ToggleRelativeOn()
+	set rnu!
+	set nu
+endfunction
+autocmd FocusLost * call ToggleRelativeOn()
+autocmd FocusGained * call ToggleRelativeOn()
+autocmd InsertEnter * call ToggleRelativeOn()
+autocmd InsertLeave * call ToggleRelativeOn()
+
+
+let g:vimwiki_list = [{
+\ 'path': '$HOME/ownCloud/vimwiki/',
+\ 'template_path': '$HOME/ownCloud/vimwiki/templates',
+\ 'template_default': 'default',
+\ 'template_ext': '.html',
+\ 'auto_toc': 1}]
+
+au BufRead,BufNewFile *.wiki set filetype=vimwiki
+function! ToggleCalendar()
+  execute ":Calendar"
+  if exists("g:calendar_open")
+    if g:calendar_open == 1
+      execute "q"
+      unlet g:calendar_open
+    else
+      g:calendar_open = 1
+    end
+  else
+    let g:calendar_open = 1
+  end
+endfunction
+
+autocmd FileType calendar nmap <buffer> <CR> :<C-u>call vimwiki#diary#calendar_action(b:calendar.day().get_day(), b:calendar.day().get_month(), b:calendar.day().get_year(), b:calendar.day().week(), "V")<CR>
diff --git a/install/install_unix.sh b/install/install_unix.sh
new file mode 100644
index 0000000..7915782
--- /dev/null
+++ b/install/install_unix.sh
@@ -0,0 +1,17 @@
+# Move to home dir
+cd ~/
+
+# Link dotfiles to the repo files
+ln -sf ~/.dotfiles/dotfiles/bashrc ~/.bashrc
+ln -sf ~/.dotfiles/dotfiles/tmux.conf ~/.tmux.conf
+ln -sf ~/.dotfiles/dotfiles/vimrc ~/.vimrc
+ln -sf ~/.dotfiles/dotfiles/Xresources ~/.Xresources
+
+# Link to the tmuxinator dir
+ln -sf ~/.dotfiles/dotfiles/tmuxinator ~/.tmuxinator
+
+# Make vim dir tree
+mkdir ~/.vim/autoload ~/.vim/bundle/
+# Link to vim autoload plugin
+ln -sf ~/.dotfiles/dotfiles/vim/autoload/pathogen.vim ~/.vim/autoload/pathogen.vim
+