add environment credentials using environ
Merge remote-tracking branch 'chris/master'
Stop using global vars!