diff --git a/Swiften/Elements/PubSubAffiliation.cpp b/Swiften/Elements/PubSubAffiliation.cpp
index 0b04494..aa8ab77 100644
--- a/Swiften/Elements/PubSubAffiliation.cpp
+++ b/Swiften/Elements/PubSubAffiliation.cpp

diff --git a/Swiften/Elements/PubSubAffiliation.h b/Swiften/Elements/PubSubAffiliation.h
index 2ea9376..6b9bc09 100644
--- a/Swiften/Elements/PubSubAffiliation.h
+++ b/Swiften/Elements/PubSubAffiliation.h

diff --git a/Swiften/Elements/PubSubAffiliations.cpp b/Swiften/Elements/PubSubAffiliations.cpp
index a53215d..d112f35 100644
--- a/Swiften/Elements/PubSubAffiliations.cpp
+++ b/Swiften/Elements/PubSubAffiliations.cpp

diff --git a/Swiften/Elements/PubSubAffiliations.h b/Swiften/Elements/PubSubAffiliations.h
index 6a413fe..0c3efa6 100644
--- a/Swiften/Elements/PubSubAffiliations.h
+++ b/Swiften/Elements/PubSubAffiliations.h

diff --git a/Swiften/Elements/PubSubConfigure.cpp b/Swiften/Elements/PubSubConfigure.cpp
index b1a6cb3..0098ca6 100644
--- a/Swiften/Elements/PubSubConfigure.cpp
+++ b/Swiften/Elements/PubSubConfigure.cpp

diff --git a/Swiften/Elements/PubSubConfigure.h b/Swiften/Elements/PubSubConfigure.h
index ed91832..84f5b82 100644
--- a/Swiften/Elements/PubSubConfigure.h
+++ b/Swiften/Elements/PubSubConfigure.h

diff --git a/Swiften/Elements/PubSubCreate.cpp b/Swiften/Elements/PubSubCreate.cpp
index 9c60de3..0ec3c38 100644
--- a/Swiften/Elements/PubSubCreate.cpp
+++ b/Swiften/Elements/PubSubCreate.cpp

diff --git a/Swiften/Elements/PubSubCreate.h b/Swiften/Elements/PubSubCreate.h
index 4e4eb92..f53fb9e 100644
--- a/Swiften/Elements/PubSubCreate.h
+++ b/Swiften/Elements/PubSubCreate.h

diff --git a/Swiften/Elements/PubSubDefault.cpp b/Swiften/Elements/PubSubDefault.cpp
index 923d0ad..1ea5d2e3 100644
--- a/Swiften/Elements/PubSubDefault.cpp
+++ b/Swiften/Elements/PubSubDefault.cpp

diff --git a/Swiften/Elements/PubSubDefault.h b/Swiften/Elements/PubSubDefault.h
index 08326e7..ef3117c 100644
--- a/Swiften/Elements/PubSubDefault.h
+++ b/Swiften/Elements/PubSubDefault.h

diff --git a/Swiften/Elements/PubSubEventAssociate.cpp b/Swiften/Elements/PubSubEventAssociate.cpp
index cb81b46..be1c35b 100644
--- a/Swiften/Elements/PubSubEventAssociate.cpp
+++ b/Swiften/Elements/PubSubEventAssociate.cpp

diff --git a/Swiften/Elements/PubSubEventAssociate.h b/Swiften/Elements/PubSubEventAssociate.h
index a752345..be4f8f4 100644
--- a/Swiften/Elements/PubSubEventAssociate.h
+++ b/Swiften/Elements/PubSubEventAssociate.h

diff --git a/Swiften/Elements/PubSubEventCollection.cpp b/Swiften/Elements/PubSubEventCollection.cpp
index a8b2a56..ca98be2 100644
--- a/Swiften/Elements/PubSubEventCollection.cpp
+++ b/Swiften/Elements/PubSubEventCollection.cpp

diff --git a/Swiften/Elements/PubSubEventCollection.h b/Swiften/Elements/PubSubEventCollection.h
index e4498aa..7789139 100644
--- a/Swiften/Elements/PubSubEventCollection.h
+++ b/Swiften/Elements/PubSubEventCollection.h

diff --git a/Swiften/Elements/PubSubEventConfiguration.cpp b/Swiften/Elements/PubSubEventConfiguration.cpp
index 93ce6a3..98c43ad 100644
--- a/Swiften/Elements/PubSubEventConfiguration.cpp
+++ b/Swiften/Elements/PubSubEventConfiguration.cpp

diff --git a/Swiften/Elements/PubSubEventConfiguration.h b/Swiften/Elements/PubSubEventConfiguration.h
index 7ebfce1..4a2197e 100644
--- a/Swiften/Elements/PubSubEventConfiguration.h
+++ b/Swiften/Elements/PubSubEventConfiguration.h

diff --git a/Swiften/Elements/PubSubEventDelete.cpp b/Swiften/Elements/PubSubEventDelete.cpp
index 85bbf2e..35c4569 100644
--- a/Swiften/Elements/PubSubEventDelete.cpp
+++ b/Swiften/Elements/PubSubEventDelete.cpp

diff --git a/Swiften/Elements/PubSubEventDelete.h b/Swiften/Elements/PubSubEventDelete.h
index fecfb0e..3641af5 100644
--- a/Swiften/Elements/PubSubEventDelete.h
+++ b/Swiften/Elements/PubSubEventDelete.h

diff --git a/Swiften/Elements/PubSubEventDisassociate.cpp b/Swiften/Elements/PubSubEventDisassociate.cpp
index 55e1c4e..7060345 100644
--- a/Swiften/Elements/PubSubEventDisassociate.cpp
+++ b/Swiften/Elements/PubSubEventDisassociate.cpp

diff --git a/Swiften/Elements/PubSubEventDisassociate.h b/Swiften/Elements/PubSubEventDisassociate.h
index cad9843..22a971f 100644
--- a/Swiften/Elements/PubSubEventDisassociate.h
+++ b/Swiften/Elements/PubSubEventDisassociate.h

diff --git a/Swiften/Elements/PubSubEventItem.cpp b/Swiften/Elements/PubSubEventItem.cpp
index 6bb3823..0922f60 100644
--- a/Swiften/Elements/PubSubEventItem.cpp
+++ b/Swiften/Elements/PubSubEventItem.cpp

diff --git a/Swiften/Elements/PubSubEventItem.h b/Swiften/Elements/PubSubEventItem.h
index 25ebc82..c22c431 100644
--- a/Swiften/Elements/PubSubEventItem.h
+++ b/Swiften/Elements/PubSubEventItem.h

diff --git a/Swiften/Elements/PubSubEventItems.cpp b/Swiften/Elements/PubSubEventItems.cpp
index 01f3429..624c844 100644
--- a/Swiften/Elements/PubSubEventItems.cpp
+++ b/Swiften/Elements/PubSubEventItems.cpp

diff --git a/Swiften/Elements/PubSubEventItems.h b/Swiften/Elements/PubSubEventItems.h
index a121728..2b0a2d9 100644
--- a/Swiften/Elements/PubSubEventItems.h
+++ b/Swiften/Elements/PubSubEventItems.h

diff --git a/Swiften/Elements/PubSubEventPurge.cpp b/Swiften/Elements/PubSubEventPurge.cpp
index 3fd77ed..3a62486 100644
--- a/Swiften/Elements/PubSubEventPurge.cpp
+++ b/Swiften/Elements/PubSubEventPurge.cpp

diff --git a/Swiften/Elements/PubSubEventPurge.h b/Swiften/Elements/PubSubEventPurge.h
index 5f04049..bd1eaf8 100644
--- a/Swiften/Elements/PubSubEventPurge.h
+++ b/Swiften/Elements/PubSubEventPurge.h

diff --git a/Swiften/Elements/PubSubEventRedirect.cpp b/Swiften/Elements/PubSubEventRedirect.cpp
index adde8bc..6c54371 100644
--- a/Swiften/Elements/PubSubEventRedirect.cpp
+++ b/Swiften/Elements/PubSubEventRedirect.cpp

diff --git a/Swiften/Elements/PubSubEventRedirect.h b/Swiften/Elements/PubSubEventRedirect.h
index 918c7f4..22d30b8 100644
--- a/Swiften/Elements/PubSubEventRedirect.h
+++ b/Swiften/Elements/PubSubEventRedirect.h

diff --git a/Swiften/Elements/PubSubEventRetract.cpp b/Swiften/Elements/PubSubEventRetract.cpp
index bb3ebb1..be28264 100644
--- a/Swiften/Elements/PubSubEventRetract.cpp
+++ b/Swiften/Elements/PubSubEventRetract.cpp

diff --git a/Swiften/Elements/PubSubEventRetract.h b/Swiften/Elements/PubSubEventRetract.h
index 3c2d9c4..075b48c 100644
--- a/Swiften/Elements/PubSubEventRetract.h
+++ b/Swiften/Elements/PubSubEventRetract.h

diff --git a/Swiften/Elements/PubSubEventSubscription.cpp b/Swiften/Elements/PubSubEventSubscription.cpp
index fb069f9..5943c32 100644
--- a/Swiften/Elements/PubSubEventSubscription.cpp
+++ b/Swiften/Elements/PubSubEventSubscription.cpp

diff --git a/Swiften/Elements/PubSubEventSubscription.h b/Swiften/Elements/PubSubEventSubscription.h
index b74d4f5..d5df5d8 100644
--- a/Swiften/Elements/PubSubEventSubscription.h
+++ b/Swiften/Elements/PubSubEventSubscription.h

diff --git a/Swiften/Elements/PubSubItem.cpp b/Swiften/Elements/PubSubItem.cpp
index ae6206f..c6cae54 100644
--- a/Swiften/Elements/PubSubItem.cpp
+++ b/Swiften/Elements/PubSubItem.cpp

diff --git a/Swiften/Elements/PubSubItem.h b/Swiften/Elements/PubSubItem.h
index 93ff03a..1bd8fa8 100644
--- a/Swiften/Elements/PubSubItem.h
+++ b/Swiften/Elements/PubSubItem.h

diff --git a/Swiften/Elements/PubSubItems.cpp b/Swiften/Elements/PubSubItems.cpp
index f235e11..966b8d6 100644
--- a/Swiften/Elements/PubSubItems.cpp
+++ b/Swiften/Elements/PubSubItems.cpp

diff --git a/Swiften/Elements/PubSubItems.h b/Swiften/Elements/PubSubItems.h
index 7cd279b..79864c5 100644
--- a/Swiften/Elements/PubSubItems.h
+++ b/Swiften/Elements/PubSubItems.h

diff --git a/Swiften/Elements/PubSubOptions.cpp b/Swiften/Elements/PubSubOptions.cpp
index 22c4054..a72ff5d 100644
--- a/Swiften/Elements/PubSubOptions.cpp
+++ b/Swiften/Elements/PubSubOptions.cpp

diff --git a/Swiften/Elements/PubSubOptions.h b/Swiften/Elements/PubSubOptions.h
index 0e9483e..0f47c26 100644
--- a/Swiften/Elements/PubSubOptions.h
+++ b/Swiften/Elements/PubSubOptions.h

diff --git a/Swiften/Elements/PubSubOwnerAffiliation.cpp b/Swiften/Elements/PubSubOwnerAffiliation.cpp
index 8dc8be6..12c871d 100644
--- a/Swiften/Elements/PubSubOwnerAffiliation.cpp
+++ b/Swiften/Elements/PubSubOwnerAffiliation.cpp

diff --git a/Swiften/Elements/PubSubOwnerAffiliation.h b/Swiften/Elements/PubSubOwnerAffiliation.h
index 68851d3..67853f7 100644
--- a/Swiften/Elements/PubSubOwnerAffiliation.h
+++ b/Swiften/Elements/PubSubOwnerAffiliation.h

diff --git a/Swiften/Elements/PubSubOwnerAffiliations.cpp b/Swiften/Elements/PubSubOwnerAffiliations.cpp
index b87a78a..7093298 100644
--- a/Swiften/Elements/PubSubOwnerAffiliations.cpp
+++ b/Swiften/Elements/PubSubOwnerAffiliations.cpp

diff --git a/Swiften/Elements/PubSubOwnerAffiliations.h b/Swiften/Elements/PubSubOwnerAffiliations.h
index 75578df..93eabd1 100644
--- a/Swiften/Elements/PubSubOwnerAffiliations.h
+++ b/Swiften/Elements/PubSubOwnerAffiliations.h

diff --git a/Swiften/Elements/PubSubOwnerConfigure.cpp b/Swiften/Elements/PubSubOwnerConfigure.cpp
index 8db923d..57405fa 100644
--- a/Swiften/Elements/PubSubOwnerConfigure.cpp
+++ b/Swiften/Elements/PubSubOwnerConfigure.cpp

diff --git a/Swiften/Elements/PubSubOwnerConfigure.h b/Swiften/Elements/PubSubOwnerConfigure.h
index d882ec4..ebe72de 100644
--- a/Swiften/Elements/PubSubOwnerConfigure.h
+++ b/Swiften/Elements/PubSubOwnerConfigure.h

diff --git a/Swiften/Elements/PubSubOwnerDefault.cpp b/Swiften/Elements/PubSubOwnerDefault.cpp
index ebb51a7..7aad448 100644
--- a/Swiften/Elements/PubSubOwnerDefault.cpp
+++ b/Swiften/Elements/PubSubOwnerDefault.cpp

diff --git a/Swiften/Elements/PubSubOwnerDefault.h b/Swiften/Elements/PubSubOwnerDefault.h
index 1dbd3a2..6593f00 100644
--- a/Swiften/Elements/PubSubOwnerDefault.h
+++ b/Swiften/Elements/PubSubOwnerDefault.h

diff --git a/Swiften/Elements/PubSubOwnerDelete.cpp b/Swiften/Elements/PubSubOwnerDelete.cpp
index a785424..8659611 100644
--- a/Swiften/Elements/PubSubOwnerDelete.cpp
+++ b/Swiften/Elements/PubSubOwnerDelete.cpp

diff --git a/Swiften/Elements/PubSubOwnerDelete.h b/Swiften/Elements/PubSubOwnerDelete.h
index c6bb3e9..f15e363 100644
--- a/Swiften/Elements/PubSubOwnerDelete.h
+++ b/Swiften/Elements/PubSubOwnerDelete.h

diff --git a/Swiften/Elements/PubSubOwnerPurge.cpp b/Swiften/Elements/PubSubOwnerPurge.cpp
index d0ac57d..6331cf2 100644
--- a/Swiften/Elements/PubSubOwnerPurge.cpp
+++ b/Swiften/Elements/PubSubOwnerPurge.cpp

diff --git a/Swiften/Elements/PubSubOwnerPurge.h b/Swiften/Elements/PubSubOwnerPurge.h
index fc410f8..05dfb63 100644
--- a/Swiften/Elements/PubSubOwnerPurge.h
+++ b/Swiften/Elements/PubSubOwnerPurge.h

diff --git a/Swiften/Elements/PubSubOwnerRedirect.cpp b/Swiften/Elements/PubSubOwnerRedirect.cpp
index 164c216..75e9819 100644
--- a/Swiften/Elements/PubSubOwnerRedirect.cpp
+++ b/Swiften/Elements/PubSubOwnerRedirect.cpp

diff --git a/Swiften/Elements/PubSubOwnerRedirect.h b/Swiften/Elements/PubSubOwnerRedirect.h
index 61db1d1..50ba66f 100644
--- a/Swiften/Elements/PubSubOwnerRedirect.h
+++ b/Swiften/Elements/PubSubOwnerRedirect.h

diff --git a/Swiften/Elements/PubSubOwnerSubscription.cpp b/Swiften/Elements/PubSubOwnerSubscription.cpp
index 3334e36..0e83951 100644
--- a/Swiften/Elements/PubSubOwnerSubscription.cpp
+++ b/Swiften/Elements/PubSubOwnerSubscription.cpp

diff --git a/Swiften/Elements/PubSubOwnerSubscription.h b/Swiften/Elements/PubSubOwnerSubscription.h
index 1c302df..7ba5e3a 100644
--- a/Swiften/Elements/PubSubOwnerSubscription.h
+++ b/Swiften/Elements/PubSubOwnerSubscription.h

diff --git a/Swiften/Elements/PubSubOwnerSubscriptions.cpp b/Swiften/Elements/PubSubOwnerSubscriptions.cpp
index a4deb59..02a1f34 100644
--- a/Swiften/Elements/PubSubOwnerSubscriptions.cpp
+++ b/Swiften/Elements/PubSubOwnerSubscriptions.cpp

diff --git a/Swiften/Elements/PubSubOwnerSubscriptions.h b/Swiften/Elements/PubSubOwnerSubscriptions.h
index 08a2f5c..c7dcfc1 100644
--- a/Swiften/Elements/PubSubOwnerSubscriptions.h
+++ b/Swiften/Elements/PubSubOwnerSubscriptions.h

diff --git a/Swiften/Elements/PubSubPublish.cpp b/Swiften/Elements/PubSubPublish.cpp
index 2ee3880..90cf6bb 100644
--- a/Swiften/Elements/PubSubPublish.cpp
+++ b/Swiften/Elements/PubSubPublish.cpp

diff --git a/Swiften/Elements/PubSubPublish.h b/Swiften/Elements/PubSubPublish.h
index 1d99420..26d1bc4 100644
--- a/Swiften/Elements/PubSubPublish.h
+++ b/Swiften/Elements/PubSubPublish.h

diff --git a/Swiften/Elements/PubSubRetract.cpp b/Swiften/Elements/PubSubRetract.cpp
index 7e3676e..7e5b720 100644
--- a/Swiften/Elements/PubSubRetract.cpp
+++ b/Swiften/Elements/PubSubRetract.cpp

diff --git a/Swiften/Elements/PubSubRetract.h b/Swiften/Elements/PubSubRetract.h
index e55897b..773bd8a 100644
--- a/Swiften/Elements/PubSubRetract.h
+++ b/Swiften/Elements/PubSubRetract.h

diff --git a/Swiften/Elements/PubSubSubscribe.cpp b/Swiften/Elements/PubSubSubscribe.cpp
index 4720321..0d13525 100644
--- a/Swiften/Elements/PubSubSubscribe.cpp
+++ b/Swiften/Elements/PubSubSubscribe.cpp

diff --git a/Swiften/Elements/PubSubSubscribe.h b/Swiften/Elements/PubSubSubscribe.h
index e2cc4ae..93eb3a5 100644
--- a/Swiften/Elements/PubSubSubscribe.h
+++ b/Swiften/Elements/PubSubSubscribe.h

diff --git a/Swiften/Elements/PubSubSubscribeOptions.cpp b/Swiften/Elements/PubSubSubscribeOptions.cpp
index 8770620..3423d02 100644
--- a/Swiften/Elements/PubSubSubscribeOptions.cpp
+++ b/Swiften/Elements/PubSubSubscribeOptions.cpp

diff --git a/Swiften/Elements/PubSubSubscribeOptions.h b/Swiften/Elements/PubSubSubscribeOptions.h
index 6612d82..9801136 100644
--- a/Swiften/Elements/PubSubSubscribeOptions.h
+++ b/Swiften/Elements/PubSubSubscribeOptions.h

diff --git a/Swiften/Elements/PubSubSubscription.cpp b/Swiften/Elements/PubSubSubscription.cpp
index a25fc06..8d6d2d7 100644
--- a/Swiften/Elements/PubSubSubscription.cpp
+++ b/Swiften/Elements/PubSubSubscription.cpp

diff --git a/Swiften/Elements/PubSubSubscription.h b/Swiften/Elements/PubSubSubscription.h
index 977cd55..a91b95e 100644
--- a/Swiften/Elements/PubSubSubscription.h
+++ b/Swiften/Elements/PubSubSubscription.h

diff --git a/Swiften/Elements/PubSubSubscriptions.cpp b/Swiften/Elements/PubSubSubscriptions.cpp
index 626e122..895f1b6 100644
--- a/Swiften/Elements/PubSubSubscriptions.cpp
+++ b/Swiften/Elements/PubSubSubscriptions.cpp

diff --git a/Swiften/Elements/PubSubSubscriptions.h b/Swiften/Elements/PubSubSubscriptions.h
index c7c19c5..f18355c 100644
--- a/Swiften/Elements/PubSubSubscriptions.h
+++ b/Swiften/Elements/PubSubSubscriptions.h

diff --git a/Swiften/Elements/PubSubUnsubscribe.cpp b/Swiften/Elements/PubSubUnsubscribe.cpp
index a4b8318..a9c8e71 100644
--- a/Swiften/Elements/PubSubUnsubscribe.cpp
+++ b/Swiften/Elements/PubSubUnsubscribe.cpp

diff --git a/Swiften/Elements/PubSubUnsubscribe.h b/Swiften/Elements/PubSubUnsubscribe.h
index 3969376..21f857b 100644
--- a/Swiften/Elements/PubSubUnsubscribe.h
+++ b/Swiften/Elements/PubSubUnsubscribe.h

diff --git a/Swiften/Elements/SecurityLabel.cpp b/Swiften/Elements/SecurityLabel.cpp
index 2e315c5..f2981c8 100644
--- a/Swiften/Elements/SecurityLabel.cpp
+++ b/Swiften/Elements/SecurityLabel.cpp

diff --git a/Swiften/Elements/SecurityLabel.h b/Swiften/Elements/SecurityLabel.h
index 24f891d..d9e18ab 100644
--- a/Swiften/Elements/SecurityLabel.h
+++ b/Swiften/Elements/SecurityLabel.h

diff --git a/Swiften/Elements/UserLocation.cpp b/Swiften/Elements/UserLocation.cpp
index f22973e..6f78ccb 100644
--- a/Swiften/Elements/UserLocation.cpp
+++ b/Swiften/Elements/UserLocation.cpp

diff --git a/Swiften/Elements/UserLocation.h b/Swiften/Elements/UserLocation.h
index 2355838..0de29f6 100644
--- a/Swiften/Elements/UserLocation.h
+++ b/Swiften/Elements/UserLocation.h

diff --git a/Swiften/Elements/UserTune.cpp b/Swiften/Elements/UserTune.cpp
index e4c0241..4b99e0a 100644
--- a/Swiften/Elements/UserTune.cpp
+++ b/Swiften/Elements/UserTune.cpp

diff --git a/Swiften/Elements/UserTune.h b/Swiften/Elements/UserTune.h
index 5e0999a..968da17 100644
--- a/Swiften/Elements/UserTune.h
+++ b/Swiften/Elements/UserTune.h