Develop merge

I believe this brings develop up to date with all of the changes, please feel free to review.