fixed annoying error on empty resultset
Merge remote-tracking branch 'origin/mock'

Conflicts:
	ftplugin/sql.vim
Merge remote-tracking branch 'origin/mock'
Merge remote-tracking branch 'origin/mock'
Better messages. This thing needs heavy refactoring soon.
added variable selection dialog
Merge remote-tracking branch 'origin/master' into mock
reverted mock breaking change