install fixes
add couchdb-lucene back to install script
Merge branch 'master' into documentation
merge master
argh