Move cstdint out of Integer

Includes merge of develop to master