update headMove to have optional concept of a room that we cannot escape, update and rename butterflies script
remove renamed script
Merge branch 'master' of https://github.com/worklist/hifi
remove debug print
Merge pull request #3395 from PhilipRosedale/master

Updated move and butterfly scripts, entity renderer uses glutCube to temporarily fix crash
Merge branch 'master' of https://github.com/highfidelity/hifi