updates from johns branch and minor styling
updating git ignore
updating
changed search form slightly
minor style tweaks
Merge branch 'andre'
Merge branch 'master' of https://github.com/jonfriese/LinkSensei into andre
Merge branch 'andre'