Merge Current Development Into Master

Want to see if we can get this to deploy properly tomorrow.