New attempt at uglier
Merge pull request #520 from benrudolph/master

New attempt at uglifier