Updating master to remove dev files

The only issue with this is that dev is now behind master by a couple commits, which is not what we want. Once this gets pulled, I'll have to update the network so that dev is ahead.