add initial loggregator tests
Merge branch 'master' into loggregator

Conflicts:
	Gemfile.lock