add database.yml to .gitignore
Merge branch 'master' of github.com:tayloredwebsites/tws_estimation

Conflicts:
	.gitignore
Merge branch 'master' of github.com:tayloredwebsites/tws_estimation
default tax rates working