recommitting yesterdays changes for heroku
more heroku compliance things added