Merge pull request #51 from craig8196/dev

Updated files so django 1.6.6 works.
Merge pull request #52 from craig8196/dev

Bigrams feature added. Importing split into two steps.
Merge branch 'dev' of https://github.com/BYU-NLP-Lab/topicalguide into dev