Init with correct conf
Merge branch 'master' of github.com:msecret/flight-yql

Conflicts:
	karma.conf.js
	lib/flight-yql.js
	package.json