applying 1.5.4 into trunk

git-svn-id: https://plugins.svn.wordpress.org/bbpress-notify-nospam/trunk@932137 b8457f37-d9ea-0310-8a92-e5e31aec5664
rebranching 1.5

git-svn-id: https://plugins.svn.wordpress.org/bbpress-notify-nospam/branches/1.5@932140 b8457f37-d9ea-0310-8a92-e5e31aec5664