added back settings
Merge branch 'dev'
merged dev into master
upped buffer size for uwsgi
added search functionality -- closes #26