Updated to most recent version

Just dumped everything in this commit. Will doc later.