Up to date

Added all the recent commits from team members, from the old repo to
this one.