let's get all the branches up to date

i merged the opposite pattern of brian, but i guess it doesn't really matter in this case. merging so that master is truly master