BAMPFA-155-b merge in latest Glen changes
Merge branch 'bampfa-155-b' into bampfa-155-c
bampfa-155-c merge in more Glen changes
Merge branch 'bampfa-155-c' into bampfa-155-d
Merge pull request #3 from chrshffmn/master

bampfa-155-d merging in changes for doc searching