[Merge] lp:~mgill25/postorius/postorius into lp:postorius

[Terri]

Review: Approve

Looks good.  We might want to clean up the templates so we don't have ifs all on one line eventually just for readability, but there didn't seem any point in being picky today, so I've merged the code.  Thanks!
-- 
https://code.launchpad.net/~mgill25/postorius/postorius/+merge/157515
Your team Mailman Coders is subscribed to branch lp:postorius.