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
Integrating mvexel's oauth code
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Integrating mvexel's oauth code

Conflicts:
	front.py
cleanup
Merge branch 'master' into oauth

* master:
  cleanup
  Integrating mvexel's oauth code
  remove consumer secret
  Ignore hash files
  Removing (non-file) settings.py
  Removing hard coded variables
  Adding settings import and make_secret
  Adding settings.py to gitignore
  Fixing function name, and adding lock stub