Modify timeout settings.  Re-organize gemfile.
Merge branch 'master' of http://github.com/Ravenstine/fremote into timeout