Add RVM path for dev vm
Fix padrino in tmux config
Add diff util for git
Update tmux config
Merge remote branch 'origin/master' into dev-vm
Add bash stuff for dev vm