Merge pull request #3 from javacruft/3.x

Misc updates as part of review
Found old garbd man file, switch to using it and delete the new one.
Merge pull request #201 from ottok/3.x

Many improvements to Galera packaging
Revert "Found old garbd man file, switch to using it and delete the new one."

This reverts commit 14aac13c246da31ef2a4533fdb22e742edea6328.
Merge branch '3.x' of https://github.com/codership/galera into 3.x