Modified settings and filenames
Merge branch 'master' of github.com:zemogle/pidoorbell