Added in some better geometry (collisions, overall usability,
corrections), and refactored.
Merge branch 'master' of https://github.com/Radirius/MERCury.git