clean-up: killing whitespace, empty clases and non-essential tests
quality: adding code coverage tracking
minor: travis changes, improving poltergeist
Merge remote-tracking branch 'upstream/master'

Conflicts:
	spec/features/query_feature_spec.rb
	spec/spec_helper.rb