Changes proposed by f0rk

relayed via mst in #magnet-srb and http://paste.scsys.co.uk/396085
My revisions to f0rk's changes
Merge remote-tracking branch 'upstream/master'
updates based on sungo and mst feedback in #magnet-srb
Merge pull request #3 from genehack/master

Revisions to rules.html