fixed timeouts; simplified rails_up; added `tm ls` command
Merge branch 'master' of github.com:EndangeredMassa/dotfiles