Added config file.
Merge branch 'master' into auth
Cleared up some commenting.
Added authorization keys.
Commenting.