Undo changes to secret key store
Made secret token reference the envirnoment var
Merge branch 'development'