Updated the Iris course - improving the merge exercise and generally fixing small typos/clarifications.
Merge pull request #4 from pelson/iris_update_Jul14

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