added meld alias
Merge branch 'master' into ubuntu
Merge branch 'master' into ubuntu
Merge branch 'master' into ubuntu
merge conflict
Merge branch 'master' into ubuntu
Added various things to VIM
Merge branch 'ubuntu' of github.com:cacsar/dotfiles into ubuntu

Conflicts:
	bash/config
Adjusted Bash Prompt
Added tmx script as function. Removed Ruby Aliases.
Change vim colorscheme to inkpot
Merge remote-tracking branch 'origin/ubuntu' into osx

Conflicts:
	bash/config
	vimrc
	zsh/aliases