updates another sed regex
merges pull request from @rch
Merge branch 'develop'
adds .pgpass updates seds, handles jetty/solr
adds a bunch of openoakland customizations
Merge branch 'develop'