Merged logger config

Shouldn't really change anything as it just removes an extra file.  Whoops, almost pull requested master....

Added logging function as discussed.