Removing obsolete time_until_generation (and test) from newpost
Resolved merge conflict.
Merge branch 'master' of github.com:Anaphory/xkcdmemes