Readd uglify
Merge branch 'master' of github.com:zifeishan/emotif
Adjusted title
Updated majority of code