updates another sed regex
add vagrant + puppet, wip
Add text to README
Merge pull request #1 from robert-chiniquy/rch/add-vagrant-and-puppet

add vagrant + puppet, wip
merges pull request from @rch
Merge branch 'develop'
adds .pgpass updates seds, handles jetty/solr
adds a bunch of openoakland customizations
Merge branch 'develop'