Maint/master/moses is cool and so are packaging repos

This is just an attempted rebase of #408.

@MosesMendoza @haus can you guys review this and make sure I didn't jack anything up?  You can go ahead and merge it if it passes the eyeball test.