Merge pull request #1 from rwhaling/master

merge upstream
remove unneeded files
add word and punctuation regexes to store in db_locals.py
fix ranked relevance unicode bug in metadata searches, plus other minor fixes
Merge pull request #2 from clovis/master

Fix unicode bug in ranked relevance
fix broken HTML tags in concordance using lxml rather than BeautifulSoup since it's much faster
add page navigation in docs
add return to root document in pager
improvements in pagination and bugfix in relevance
Merge pull request #3 from clovis/master

add pagination for docs among other things
reduce image size, and reduce header size
Merge pull request #4 from clovis/master

reduce header size
Merge pull request #5 from rwhaling/master

clean up old .pyc files, etc
Merge pull request #1 from ARTFL-Project/master

merge in clovis's updates