Merge pull request #47 from surreal8/master

changing glossary filter to use wiki syntax temporarily