Revert "Added /NoRestart flag when disabling a feature."
Merge pull request #27 from puppetlabs/revert-26-master

Revert "Added /NoRestart flag when disabling a feature."
MODULES-1389 Add ability to specify NoRestart, default behavior remains, added tests
Merge pull request #28 from cyberious/NoRestart

MODULES-1389 Add ability to specify NoRestart both enable and disable.
1.1.0 prep
Merge pull request #29 from mhaskel/1.1.0-prep

1.1.0 prep
Merge branch 'master' of https://github.com/puppetlabs/puppetlabs-dism.git

Conflicts:
	lib/puppet/provider/dism/dism.rb