Merge pull request #300 from paulej72/master

fix Edit Story page.
Merge pull request #301 from paulej72/master

stupid error
Merge pull request #302 from paulej72/master

logic fail.
Show Story/Journal above during reply.
Merge branch 'master' of git://github.com/SoylentNews/slashcode
Overlooked one bit in #309.
Merge pull request #309 from TheMightyBuzzard/master

Show Story/Journal above during reply.
Fix for subscriptions->messages wonkiness.
Fixes for three of mrcoolbp's issues
Merge pull request #315 from TheMightyBuzzard/quickfix

Fix for subscriptions->messages wonkiness.
Merge pull request #316 from TheMightyBuzzard/typos

Fixes for three of Bytram's issues