snoplus/orca-snoplus — pull request #37 by cjones2500 (2014-08-28 10:32:18+00:00)
Title: Smellie/basic interface into main snoplus ellie branch

Dealing with several conflicts within this branch