moved generater and range into their own header files
Merge branch 'master' of https://github.com/SimulatedSimian/working