added timeout handling.  added more gems
Merge branch 'master' of github.com:simianarmy/ghost_horse_whisperer