Reorder commits and adjust private/protected staus
Merge ../xorlev

Conflicts:
	src/main/java/com/rapportive/storm/spout/AMQPSpout.java