Added support for choice parameter
Merge remote-tracking branch 'upstream/master'
Removing commented out code
Merge pull request #6 from crimsonknave/master

Add support for choice parameter
Merge commit '237c86112f403b299e966c601380a547a36d4b6f'

Conflicts:
	spec/unit_tests/generator_spec.rb