Fixed the 1.5 stuff to work. Hooray!
Merge branch 'master' of https://github.com/planetguy32/Gizmos