Merge pull request #64 from lunaryorn/reset-faces

Properly reset attributes when using underlines