changes
Merge branch 'master' of https://github.com/ptrln/dataflow
spacejam
Merge branch 'master' of https://github.com/ptrln/dataflow

Conflicts:
	app/views/query/index.html.erb
Merge branch 'master' of https://github.com/ptrln/dataflow
Merge branch 'master' of https://github.com/ptrln/dataflow
Merge branch 'master' of https://github.com/ptrln/dataflow
style
Merge branch 'master' of https://github.com/ptrln/dataflow