bundle for hourly rates update
changed to ruby-version (bundler removes need for rvmrc gemsets
gem updates
Merge branch 'master' of github.com:tayloredwebsites/tws_estimation

Conflicts:
	Gemfile.lock
Merge branch 'master' of github.com:tayloredwebsites/tws_estimation

Conflicts:
	Gemfile
single test ties out for taxes