fixed formatting
Merge branch 'aggregation-builder'

Conflicts:
	src/main/java/org/mongojack/Aggregation.java