make propertybase specific
add oracle environment
adjust java environment for Mac OS
Merge branch 'master' into propertybase

Conflicts:
	zshrc
add options for mux
add options for tmux
bring to latest version
Merge branch 'master' into propertybase

Conflicts:
	tmux.conf
add layout for falcon projet
add tmuxifier layout for falcon project
remove bundler plugin
add bundler plugin (back)
update falcon settings
Merge branch 'master' into propertybase

Conflicts:
	zshrc
change ruby version to 1.9
add marozi tmux layouts to propertybase
remove tmux zoom commant
Merge branch 'master' of github.com:leifg/dotfiles

Conflicts:
	zshrc
Merge branch 'propertybase'

Conflicts:
	zshrc
remove arrow keys in vim