Simplify the encoding parsing routine
Test for the case where `# coding: `
Bring back a comment about coding parser behavior
Merge pull request #336 from gittip/simplify_encoding_parsing

Simplify the encoding parsing routine