Merge pull request #111 from ChrisGrant/master

Removing path that shouldn't have been in the framework search paths.
Replaced "shadows" with "shadow".
Merge pull request #115 from ChrisGrant/shadowRefactor

Replaced "shadows" with "shadow".