Merge branch 'release/0.5' into dev
Merge branch 'hotfix/0.5.1' into dev
Using the ENV folder for python enviornments
Using port 25 for email on nsa hosts
making sure deployment does not change the db
bumping version to 0.5.2
Merge branch 'release/0.5.2'
Merge branch 'release/0.5.2' into dev
Merge branch 'dev'