Remove PRISM definition
Merge pull request #40 from mojolingo/no_more_prism

Remove PRISM definition
No more PRISM
Complete Berkshelf upgrade to stable release
Merge branch 'master' into feature/pre-built-boxes

* master:
  Complete Berkshelf upgrade to stable release
  No more PRISM
  Remove PRISM definition

Conflicts:
	Berksfile
	Berksfile.lock
	Gemfile
	Gemfile.lock
	README.markdown
	cookbook/metadata.rb