Full upgrade trusty

This pull request has been fully tested, has new mods but also integrates #70 #60 and #39