fixed diff bug
Merge pull request #212 from xithan/revandmail

fixed diff bug
more diff fixes
Merge pull request #213 from xithan/revandmail

more diff fixes
forgot pry
Merge remote-tracking branch 'upstream/wikirate' into wikirate
small css fixes
another diff fix
diff fix
more diff fixes
regex typo