Merge proposals on Smith-Mundt Modernization Act of 2012

[aeschylus (Maura)]

Please add this proposal to the mix as well: Make media propaganda illegal again