Taxes tie out and tested
rdiscount gem put back for markdown displays
Merge branch 'master' of github.com:tayloredwebsites/tws_estimation

Conflicts:
	spec/integration/estimates_integration_spec.rb