Get joe branch merged

bulk merge joe dev back into master

worked through some conflicts, there are some rough spots, but comparable to what already existed in master/joe