lock to chef <= 11.0.1 to prevent json dep conflict with vagrant
version bump 1.1.4
Merge branch '1-1-stable'

Conflicts:
	berkshelf.gemspec