Merge pull request #54 from jeffdavidgordon/v4.0

Added an extra meta line for better UTF-8 support in Dreamweaver
Removed Dreamweaver fix, since it applies only to CS5