whoops - forgot this is for homesick
Merge branch 'master' of github.com:hdgarrood/dotfiles

Conflicts:
	home/oh-my-zsh/README.markdown
	home/oh-my-zsh/lib/aliases.zsh
	home/oh-my-zsh/lib/completion.zsh
	home/oh-my-zsh/lib/functions.zsh
	home/oh-my-zsh/lib/git.zsh
	home/oh-my-zsh/lib/keybindings.zsh
	home/oh-my-zsh/lib/misc.zsh
	home/oh-my-zsh/lib/options.zsh
	home/oh-my-zsh/lib/rvm.zsh
	home/oh-my-zsh/lib/spectrum.zsh
	home/oh-my-zsh/lib/termsupport.zsh
	home/oh-my-zsh/lib/theme.zsh
	home/oh-my-zsh/lib/virtualenv.zsh
	home/oh-my-zsh/oh-my-zsh.sh
	home/oh-my-zsh/plugins/ant/ant.plugin.zsh
	home/oh-my-zsh/plugins/apache2-macports/apache2-macports.plugin.zsh
	home/oh-my-zsh/plugins/archlinux/archlinux.plugin.zsh
	home/oh-my-zsh/plugins/autojump/autojump.plugin.zsh
	home/oh-my-zsh/plugins/battery/battery.plugin.zsh
	home/oh-my-zsh/plugins/brew/_brew
	home/oh-my-zsh/plugins/brew/brew.plugin.zsh
	home/oh-my-zsh/plugins/bundler/_bundler
	home/oh-my-zsh/plugins/bundler/bundler.plugin.zsh
	home/oh-my-zsh/plugins/cake/cake.plugin.zsh
	home/oh-my-zsh/plugins/cap/cap.plugin.zsh
	home/oh-my-zsh/plugins/cloudapp/cloudapp.plugin.zsh
	home/oh-my-zsh/plugins/cloudapp/cloudapp.rb
	home/oh-my-zsh/plugins/command-not-found/command-not-found.plugin.zsh
	home/oh-my-zsh/plugins/compleat/compleat.plugin.zsh
	home/oh-my-zsh/plugins/cpanm/_cpanm
	home/oh-my-zsh/plugins/debian/debian.plugin.zsh
	home/oh-my-zsh/plugins/dirpersist/dirpersist.plugin.zsh
	home/oh-my-zsh/plugins/django/django.plugin.zsh
	home/oh-my-zsh/plugins/extract/_extract
	home/oh-my-zsh/plugins/extract/extract.plugin.zsh
	home/oh-my-zsh/plugins/gas/_gas
	home/oh-my-zsh/plugins/gem/_gem
	home/oh-my-zsh/plugins/git-flow/git-flow.plugin.zsh
	home/oh-my-zsh/plugins/git/git.plugin.zsh
	home/oh-my-zsh/plugins/github/_github
	home/oh-my-zsh/plugins/github/github.plugin.zsh
	home/oh-my-zsh/plugins/gnu-utils/gnu-utils.plugin.zsh
	home/oh-my-zsh/plugins/gpg-agent/gpg-agent.plugin.zsh
	home/oh-my-zsh/plugins/gradle/gradle.plugin.zsh
	home/oh-my-zsh/plugins/grails/grails.plugin.zsh
	home/oh-my-zsh/plugins/heroku/_heroku
	home/oh-my-zsh/plugins/history-substring-search/README
	home/oh-my-zsh/plugins/history-substring-search/history-substring-search.plugin.zsh
	home/oh-my-zsh/plugins/history-substring-search/history-substring-search.zsh
	home/oh-my-zsh/plugins/jake-node/jake-node.plugin.zsh
	home/oh-my-zsh/plugins/kate/kate.plugin.zsh
	home/oh-my-zsh/plugins/knife/_knife
	home/oh-my-zsh/plugins/lein/lein.plugin.zsh
	home/oh-my-zsh/plugins/lighthouse/lighthouse.plugin.zsh
	home/oh-my-zsh/plugins/lol/lol.plugin.zsh
	home/oh-my-zsh/plugins/macports/_port
	home/oh-my-zsh/plugins/macports/macports.plugin.zsh
	home/oh-my-zsh/plugins/mercurial/mercurial.plugin.zsh
	home/oh-my-zsh/plugins/mysql-macports/mysql-macports.plugin.zsh
	home/oh-my-zsh/plugins/node/node.plugin.zsh
	home/oh-my-zsh/plugins/npm/npm.plugin.zsh
	home/oh-my-zsh/plugins/nyan/nyan.plugin.zsh
	home/oh-my-zsh/plugins/osx/_man-preview
	home/oh-my-zsh/plugins/osx/osx.plugin.zsh
	home/oh-my-zsh/plugins/perl/perl.plugin.zsh
	home/oh-my-zsh/plugins/phing/phing.plugin.zsh
	home/oh-my-zsh/plugins/pip/_pip
	home/oh-my-zsh/plugins/pow/pow.plugin.zsh
	home/oh-my-zsh/plugins/powder/_powder
	home/oh-my-zsh/plugins/python/python.plugin.zsh
	home/oh-my-zsh/plugins/rails/rails.plugin.zsh
	home/oh-my-zsh/plugins/rails3/rails3.plugin.zsh
	home/oh-my-zsh/plugins/rake/rake.plugin.zsh
	home/oh-my-zsh/plugins/rbenv/rbenv.plugin.zsh
	home/oh-my-zsh/plugins/redis-cli/_redis-cli
	home/oh-my-zsh/plugins/ruby/ruby.plugin.zsh
	home/oh-my-zsh/plugins/rvm/_rvm
	home/oh-my-zsh/plugins/rvm/rvm.plugin.zsh
	home/oh-my-zsh/plugins/sprunge/sprunge.plugin.zsh
	home/oh-my-zsh/plugins/ssh-agent/ssh-agent.plugin.zsh
	home/oh-my-zsh/plugins/svn/svn.plugin.zsh
	home/oh-my-zsh/plugins/symfony2/symfony2.plugin.zsh
	home/oh-my-zsh/plugins/taskwarrior/_task
	home/oh-my-zsh/plugins/taskwarrior/taskwarrior.plugin.zsh
	home/oh-my-zsh/plugins/terminalapp/terminalapp.plugin.zsh
	home/oh-my-zsh/plugins/terminitor/_terminitor
	home/oh-my-zsh/plugins/textmate/textmate.plugin.zsh
	home/oh-my-zsh/plugins/thor/_thor
	home/oh-my-zsh/plugins/vagrant/_vagrant
	home/oh-my-zsh/plugins/vi-mode/vi-mode.plugin.zsh
	home/oh-my-zsh/plugins/vundle/vundle.plugin.zsh
	home/oh-my-zsh/plugins/wakeonlan/README
	home/oh-my-zsh/plugins/wakeonlan/_wake
	home/oh-my-zsh/plugins/wakeonlan/wakeonlan.plugin.zsh
	home/oh-my-zsh/plugins/yum/yum.plugin.zsh
	home/oh-my-zsh/themes/Soliah.zsh-theme
	home/oh-my-zsh/themes/afowler.zsh-theme
	home/oh-my-zsh/themes/alanpeabody.zsh-theme
	home/oh-my-zsh/themes/apple.zsh-theme
	home/oh-my-zsh/themes/arrow.zsh-theme
	home/oh-my-zsh/themes/aussiegeek.zsh-theme
	home/oh-my-zsh/themes/awesomepanda.zsh-theme
	home/oh-my-zsh/themes/bira.zsh-theme
	home/oh-my-zsh/themes/blinks.zsh-theme
	home/oh-my-zsh/themes/candy.zsh-theme
	home/oh-my-zsh/themes/clean.zsh-theme
	home/oh-my-zsh/themes/cloud.zsh-theme
	home/oh-my-zsh/themes/crunch.zsh-theme
	home/oh-my-zsh/themes/cypher.zsh-theme
	home/oh-my-zsh/themes/dallas.zsh-theme
	home/oh-my-zsh/themes/darkblood.zsh-theme
	home/oh-my-zsh/themes/daveverwer.zsh-theme
	home/oh-my-zsh/themes/dieter.zsh-theme
	home/oh-my-zsh/themes/dogenpunk.zsh-theme
	home/oh-my-zsh/themes/dpoggi.zsh-theme
	home/oh-my-zsh/themes/dst.zsh-theme
	home/oh-my-zsh/themes/dstufft.zsh-theme
	home/oh-my-zsh/themes/duellj.zsh-theme
	home/oh-my-zsh/themes/eastwood.zsh-theme
	home/oh-my-zsh/themes/edvardm.zsh-theme
	home/oh-my-zsh/themes/evan.zsh-theme
	home/oh-my-zsh/themes/example.zsh-theme
	home/oh-my-zsh/themes/fino.zsh-theme
	home/oh-my-zsh/themes/fishy.zsh-theme
	home/oh-my-zsh/themes/flazz.zsh-theme
	home/oh-my-zsh/themes/fletcherm.zsh-theme
	home/oh-my-zsh/themes/fox.zsh-theme
	home/oh-my-zsh/themes/frisk.zsh-theme
	home/oh-my-zsh/themes/funky.zsh-theme
	home/oh-my-zsh/themes/fwalch.zsh-theme
	home/oh-my-zsh/themes/gallifrey.zsh-theme
	home/oh-my-zsh/themes/gallois.zsh-theme
	home/oh-my-zsh/themes/garyblessington.zsh-theme
	home/oh-my-zsh/themes/gentoo.zsh-theme
	home/oh-my-zsh/themes/geoffgarside.zsh-theme
	home/oh-my-zsh/themes/gnzh.zsh-theme
	home/oh-my-zsh/themes/gozilla.zsh-theme
	home/oh-my-zsh/themes/humza.zsh-theme
	home/oh-my-zsh/themes/imajes.zsh-theme
	home/oh-my-zsh/themes/jbergantine.zsh-theme
	home/oh-my-zsh/themes/jispwoso.zsh-theme
	home/oh-my-zsh/themes/jnrowe.zsh-theme
	home/oh-my-zsh/themes/jonathan.zsh-theme
	home/oh-my-zsh/themes/josh.zsh-theme
	home/oh-my-zsh/themes/jreese.zsh-theme
	home/oh-my-zsh/themes/jtriley.zsh-theme
	home/oh-my-zsh/themes/juanghurtado.zsh-theme
	home/oh-my-zsh/themes/kardan.zsh-theme
	home/oh-my-zsh/themes/kennethreitz.zsh-theme
	home/oh-my-zsh/themes/kolo.zsh-theme
	home/oh-my-zsh/themes/kphoen.zsh-theme
	home/oh-my-zsh/themes/lambda.zsh-theme
	home/oh-my-zsh/themes/linuxonly
	home/oh-my-zsh/themes/lukerandall.zsh-theme
	home/oh-my-zsh/themes/macovsky-ruby.zsh-theme
	home/oh-my-zsh/themes/macovsky.zsh-theme
	home/oh-my-zsh/themes/maran.zsh-theme
	home/oh-my-zsh/themes/mgutz.zsh-theme
	home/oh-my-zsh/themes/mh.zsh-theme
	home/oh-my-zsh/themes/mikeh.zsh-theme
	home/oh-my-zsh/themes/miloshadzic.zsh-theme
	home/oh-my-zsh/themes/minimal.zsh-theme
	home/oh-my-zsh/themes/mortalscumbag.zsh-theme
	home/oh-my-zsh/themes/mrtazz.zsh-theme
	home/oh-my-zsh/themes/murilasso.zsh-theme
	home/oh-my-zsh/themes/muse.zsh-theme
	home/oh-my-zsh/themes/nanotech.zsh-theme
	home/oh-my-zsh/themes/nebirhos.zsh-theme
	home/oh-my-zsh/themes/nicoulaj.zsh-theme
	home/oh-my-zsh/themes/norm.zsh-theme
	home/oh-my-zsh/themes/obraun.zsh-theme
	home/oh-my-zsh/themes/philips.zsh-theme
	home/oh-my-zsh/themes/pmcgee.zsh-theme
	home/oh-my-zsh/themes/prose.zsh-theme
	home/oh-my-zsh/themes/pygmalion.zsh-theme
	home/oh-my-zsh/themes/re5et.zsh-theme
	home/oh-my-zsh/themes/rgm.zsh-theme
	home/oh-my-zsh/themes/risto.zsh-theme
	home/oh-my-zsh/themes/rixius.zsh-theme
	home/oh-my-zsh/themes/rkj-repos.zsh-theme
	home/oh-my-zsh/themes/rkj.zsh-theme
	home/oh-my-zsh/themes/robbyrussell.zsh-theme
	home/oh-my-zsh/themes/sammy.zsh-theme
	home/oh-my-zsh/themes/simple.zsh-theme
	home/oh-my-zsh/themes/skaro.zsh-theme
	home/oh-my-zsh/themes/smt.zsh-theme
	home/oh-my-zsh/themes/sorin.zsh-theme
	home/oh-my-zsh/themes/sporty_256.zsh-theme
	home/oh-my-zsh/themes/steeef.zsh-theme
	home/oh-my-zsh/themes/sunaku.zsh-theme
	home/oh-my-zsh/themes/sunrise.zsh-theme
	home/oh-my-zsh/themes/superjarin.zsh-theme
	home/oh-my-zsh/themes/suvash.zsh-theme
	home/oh-my-zsh/themes/takashiyoshida.zsh-theme
	home/oh-my-zsh/themes/terminalparty.zsh-theme
	home/oh-my-zsh/themes/theunraveler.zsh-theme
	home/oh-my-zsh/themes/tjkirch.zsh-theme
	home/oh-my-zsh/themes/tonotdo.zsh-theme
	home/oh-my-zsh/themes/trapd00r.zsh-theme
	home/oh-my-zsh/themes/wedisagree.zsh-theme
	home/oh-my-zsh/themes/wezm+.zsh-theme
	home/oh-my-zsh/themes/wezm.zsh-theme
	home/oh-my-zsh/themes/wuffers.zsh-theme
	home/oh-my-zsh/themes/xiong-chiamiov-plus.zsh-theme
	home/oh-my-zsh/themes/xiong-chiamiov.zsh-theme
	home/oh-my-zsh/themes/zhann.zsh-theme
	home/zprofile
	home/zshrc