Updated to support the MS Assessment and Planning Toolkit SQL report that Balaji sent to me.  Also updated the Aspect SQL file section to further parse the server name since I found that they are mixing regular servernames with full servernames like foo.bar.com.