Fixing function name, and adding lock stub
Merge remote-tracking branch 'mvexel/master'
Merge remote-tracking branch 'mvexel/master'
Adding settings.py to gitignore
Adding settings import and make_secret
Removing hard coded variables
Removing (non-file) settings.py
Ignore hash files
remove consumer secret