Fixed Specific Version
Merge branch 'uat'

Conflicts:
	.ruby-version
fix for mac osx
Merge branch 'master' of github.com:PSGWealth/irr

Conflicts:
	Gemfile
	Gemfile.lock
changes for testing
poma-6680 debugging
added puma to the development env
bundle update
additional rebate columns for myStatement
fixing tau url
added bin to gitignore
puma config
cleanup