Dev pull

There are almost a year's worth of commits between master and dev. Hoping to merge soon.