Added ability to specify file generator.
Merged two working branches. Added ability to specify file type.
Merged two branches.
Minor updates to spacing and comments.
Merge branch 'master' of github.com:wkettler/filegen

Conflicts:
	filegen.py
Bug fixes.