Merge branch 'master' of github.com:eHealthAfrica/kano-konnect

Merging my local master with Github master so I can merge everything
together and deploy the current master to the production server.
Merge branch 'develop'

Merging develop branch into master so that the production server can be
set back to master and still demonstrate boilerplate project.
Added an anchor file so the local logging directory is tracked by git and created on a repo clone. Tweaked documentation for how to pull new code on the server to account for the fact that Github agent forwarding went wonky and I was forced to use a deploy key, which is slightly complicated for the nobody user.
Added an anchor file so the local logging directory is tracked by git and created on a repo clone. Tweaked documentation for how to pull new code on the server to account for the fact that Github agent forwarding went wonky and I was forced to use a deploy key, which is slightly complicated for the nobody user.

Tweaked settings to change path to local log directory on the server.
Cleaning up on failed local merge