Simplified and removed a lot of code, hooray.
Simplified and removed a lot of code, hooray.

webdev1001/shifty,modulexcite/shifty,webdev1001/shifty,GerHobbelt/shifty,jeremyckahn/shifty,acidhax/shifty,modulexcite/shifty,GerHobbelt/shifty,acidhax/shifty