Updates to ambiguous warning output

* Re-added source line numbers for new ambiguous definition
* Cleaned up formatting
Merge pull request #2617 from kmsquire/ambiguous_warning_update

Updates to ambiguous warning output