WIP
Merge branch 'master' into raml_feature_flags

Conflicts:
	dist/raml-parser.js
	dist/raml-parser.min.js
Removed extra flag from spike
Merge branch 'master' into raml_feature_flags
Added tests for feature flags
Merge branch 'master' into raml_feature_flags

Conflicts:
	dist/raml-parser.js
	dist/raml-parser.min.js
	lib/transformations.js
	src/composer.coffee
	src/transformations.coffee
Made feature flags a dictionary
Made all file handling requests asynchronous (including #include's)
Merge branch 'master' into raml_feature_flags

Conflicts:
	dist/raml-parser.js
	dist/raml-parser.min.js
Moved URL resolution to raml.coffee
Removed console.log
Merge branch 'master' of github.com:raml-org/raml-js-parser into raml_feature_flags

Conflicts:
	dist/raml-parser.js
	dist/raml-parser.min.js
Added missing watch pakacge
Merge branch 'master' of github.com:raml-org/raml-js-parser into async_parser

Conflicts:
	package.json
Refactor to make file reading injectable
Fixed error handling, now it reports the correct line on an error, also handles in-browser includes correctly
Removed unneeded requires from raml.coffee
Added tests for include resolution injection
Removed default settings in transformations
Removed settings from composer