Changed to use bootstrap tabs instead of jquery-ui ones; dynamic tabs are weird with this still
Merge remote-tracking branch 'upstream/master'