Added support for vagrant-cachier
	modified:   manifests/pycortex.pp
Merge pull request #8 from vsoch/master

Increase timeout in manifests/pycortex.pp
deals with the slow uploads
Merge branch 'master' of https://github.com/NeuroVault/neurovault_puppet

* 'master' of https://github.com/NeuroVault/neurovault_puppet:
  modified:   manifests/pycortex.pp
Merge pull request #6 from chrisfilo/enh/cache

Caching of packages and downloads for NeuroVault VM
Merge pull request #9 from chrisfilo/enh/network_performance

deals with slow uploads on virtualbox
	modified:   confs/nvault.pp
Merge pull request #10 from vsoch/master

Remove freesurfer credentials from confs/nvault.pp
fixed a typo
added missing variable
added missing variable
added missing variable
editing local_settings instead of settings, also a race condition for the wsgi socket
fixed freesurfer download call
the extra blank `wget` call made it return status 4
django 1.7.1 needed for migration change
Merge pull request #12 from NeuroVault/enh/tweaks

Enh/tweaks
increase untar timeout for slow machines