^^ feature freeze ^^

http://baystation12.net/forums/viewtopic.php?f=12&t=11801&view=unread#unread
No feature PRs until this mess of a merge is sorted out and the staging system is fixed.

(ignore code in this PR, was the first branch on the list)