Really this time.
Merge pull request #47 from hamptonsmith/diecrlfdie

Really this time.