test
Merge branch 'master' of https://github.com/thinkingmedia/Prometheus

Conflicts:
	Prometheus/Grammar/Grammar.egt
Revert "going to revert."

This reverts commit f6a402d663a63f39bd2faabccd2a2f7b23db42cb.

Conflicts:
	Prometheus/Grammar/Grammar.egt
	Prometheus/Parser/Executors/ExecutorBase.cs
	Prometheus/Prometheus.csproj
reverted changes from last 2 commits.