flask server defaults
Merge remote-tracking branch 'upstream/master'
Fixing function name, and adding lock stub
Merge remote-tracking branch 'mvexel/master'