Update gruntfile; rebuild
Continue rename
Update tests
Merge
Merge branch 'master' of https://github.com/dabbler0/ice_editor_canvas