Account for possibility of 'Extended' projects on Marmoset
Merge git://github.com/cs136/seashell
Merge pull request #125 from kpalway/master

Account for Extended Marmoset projects