Upgraded uglifier and removed therubyracer and erd.
Merge branch 'gem_stuff' into develop