Merge pull request #19 from ndhoule/development

Basic searching working
Merge pull request #21 from ndhoule/development

DS_Store cleanup, image reorganization
Update .gitignore
Merge pull request #22 from ndhoule/development

Removed vestigal searchform file
Merge remote-tracking branch 'upstream/development' into development