remove axis
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
fixed edit user page
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
Merge branch 'master' of heroku.com:strategy-stroller
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
still fixing update pages
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
temp password mailer bug
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
fixed migrations to not use 'change_column'
Merge branch 'master' of https://github.com/markddavidoff/strategystroller
fixed seed file and admin settings redirects [Fixes #49176497]
Merge branch 'master' of github.com:markddavidoff/strategystroller