Updated the Iris course - improving the merge exercise and generally fixing small typos/clarifications.