ERT Update

Bevy of ERT changes and updates, outlined in a forum thread here: http://baystation12.net/forums/viewtopic.php?f=5&t=11590

P.S. Merge quick, we all know how good I am at fixing conflicts...