Added coffee stuff and minor edits.
Merge branch 'master' of github.com:caltemose/paris2013