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
Added feature, Throttle Concurrent Jobs
Added feature: Prepare Environment
Adding RSpec text for prepare environment and throttle
Merge commit '6bf38cbe0a5e6704dea1cdcdb345e5c508e8e709'
Merge commit '197f020792248dcd50da228cdebd1f7e46ec199a'

Conflicts:
	spec/unit_tests/generator_spec.rb
Merge commit '237c86112f403b299e966c601380a547a36d4b6f'

Conflicts:
	spec/unit_tests/generator_spec.rb
Merge pull request #10 from brgaulin/master

Adding features: build periodically, timestamp, inject env var, etc.
Bump to 0.4.1