Add vagrant to gitignore
Merge branch 'master' of github.com:globaleaks/GlobaLeaks

* 'master' of github.com:globaleaks/GlobaLeaks:
  Fix regex for custom theme loading (build client)
  typ0 corrections
  Add exception for travis with the iptables NAT support check
  Fixed a check for iptables NAT support before installing.
  Workaround for DO() bug escaping > and | characters
  Try to fix a script due to a bug of pipe being escaped by DO() function
  Add python-pip dependency   This spot earlier if the ubuntu doesn't have "universe" in /etc/apt/sources.list
  Add support for obtaining the version of GLCLient from the installed globaleaks
  Add support for adding custom stylesheets
  Only backup GLClient to .default if we have not done so already
  Fix vagrantfile
  Import VagrantFile from https://github.com/lastknight/globaleaks_vagrant
  Add script for building a custom glclient build and installing it
Write to tmp file before catting.