cegli/dolphin — pull request #8 by CarlKenner (2014-11-29 11:18:31+00:00)
Title: everything up to the difficult merge

Everything up to the difficult merge, plus the RachelBryk commit after.