Properly handle log symlinks with expanduser
Print out exception before entering pdb for easier debugging
Merge branch 'master' into dev