Cleaning up and streamlining Types.h,
Merge pull request #902 from Winterleaf/Types.h

Cleaning up and streamlining Types.h,