changed git config for work machine
commented out esc mapping
fixed .zshrc
hamlc as haml
merged in master
merged changing stuff back
Merge branch 'master' into theprogram

* master:
  remmapped join to control J
Merge branch 'master' into theprogram

* master:
  mapped joing to alt+j
Merge branch 'master' into theprogram

* master:
  mapped joing to alt+j
Merge branch 'master' into theprogram

* master:
  mapped join to command j
Merge branch 'master' into theprogram

* master:
  mapped , j to join
added alias for torquebox
changed path from Chomper to Eli
path changes
removing rvm ish
changed the way I manage oh my zsh
Added mysql fix to my path
updated some stuffs
fixed stuffs
add .ruby-version to global ignore