Merged all users who wanted to opt-out at once instead of asking them to rebase

This closes pull request #90 #91 #92 #93 #94 #95 #96 and doesn't ask the users to rebase.