Changed when n_generate is applied from inside the optimization function to when the generator is being initialized
Merge branch 'master' into refactoring

Conflicts:
	fresco/command_line_wrapper.py
Rewrote 'stitching' test outcome function
Removed debugging code
Merge pull request #28 from rybern/refactoring

Refactoring
foobarbaz
Merge pull request #29 from jrrideout/cleanup2

foobarbaz