Merge pull request #842 from leider/master

Fixing #840 (vagrant-trouble)
Merge pull request #843 from leider/master

Tweaking SoCraTes site
Merge commit '3bd9b1ed381e67dcd597245788cb23f9ba6915d6'