Cleaned up logging, add pystache