vagrant init
Made numpy version requirements less restrictive
Merge branch 'devel' into vagrant
Merge branch 'devel' into vagrant
Vagrantfile contains now all the necessary provisioning
Merge branch 'devel' into vagrant
Merge remote-tracking branch 'origin/devel' into vagrant
Added bokeh and pandas wheels to .travis.yml
Fixed --find-links in .travis.yml
Added pyzmq to wheelhouse
Try to fix stalled build on travis-ci
Merge branch 'devel' into vagrant
Changed forwarded port to something non-default (IPython notebook)
Back to glpk 4.45 in Vagrantfile
 Give VM 1/4 system memory & access to all cpu cores on the host
Merge remote-tracking branch 'origin/vagrant' into vagrant

Conflicts:
	Vagrantfile
Merge branch 'devel' into vagrant

Conflicts:
	.travis.yml
	tests/test_flux_analysis.py
Install requirements.txt before escher
Added matplotlib and escher to Vagrantfile
Merge branch 'devel' into vagrant

Conflicts:
	requirements.txt