Fixed merge conflicts. (+3 squashed commit)

Squashed commit:

[fcc34a6] Fixed missing line break between description and attributes.

[62297f8] message is more euh clean...

[cbd4828] A player should be a CommandSource. And most Command Sources can receive messages. (+1 squashed commits)

Squashed commits:

[cbd4828] A player should be a CommandSource. And most Command Sources can receive messages.
Merge pull request #173 from thomas15v/command-Patch

A Player should be a CommandSource.
Merge pull request #1 from SpongePowered/master

l