Update version to 1.1.4
Merge pull request #59 from cibernox/upstream_master

Update version to 1.1.4
Transforming Ember-cpm in an standard ember addon
Move .jshintrc
Don't ignore /dist folder for now
Fixed build names.
Merge pull request #58 from cibernox/master

Transforming Ember-cpm in an standard ember addon
Major bump version and update redme.
Merge pull request #60 from cibernox/master

Major bump version and update readme.
Rephase contributing section to make it easier to people without ember-cli exp
Merge branch 'main_master' into allEqual

Conflicts:
	addon/ember-cpm.js
	addon/utils.js
	dist/amd/ember-cpm.js
	dist/amd/utils.js
	dist/cjs/ember-cpm.js
	dist/cjs/utils.js
	dist/globals/ember-cpm.js
	dist/named-amd/ember-cpm.js