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
restore old rule deletions to card migration
final cleanup before wikirate live deploy.  migration tweak, flexmail removal
Merge branch 'master' into wikirate
vignesh's css changes
Merge branch 'wikirate' of https://github.com/wagn/wagn into wikirate
notify fixes
mail changes
fixed watch- and date-related airbrake errors
urgent mail fix