fix some stuff
Merge branch 'master' of git://github.com/formorer/paste.pl