using env vars to decide which public folder to load; add new dist folder
test
turned off ftp
Merge branch 'feature/newdist' into dev
bumped version number to 1.1
Merge branch 'release/v1.1' into dev
Merge branch 'dev' into feature/manage
turn ftp back on
cleaned up some code too