changed keys to ENV variables
Merge branch 'moar-security' into development