Remove canvas__wrap
Checkin
Merge branch 'master' of https://github.com/djfrsn/Water into dev