ENH: Vagrantfile for PySAL devs and workshops
Merge branch 'master' of github.com:pysal/pysal into vagrant
ENH: clusterpy dependency for contrib/clusterpy
Merge pull request #458 from sjsrey/vagrant

ENH: Vagrantfile for PySAL devs and workshops
ENH: handle the case of an ergodic distribution where one state has 0 probability
Merge pull request #462 from sjsrey/sm

ENH: handle the case of an ergodic distribution where one state has 0 probability
updating gitignore
Merge pull request #463 from sjsrey/ignore_git

updating gitignore
trying to rebase
Rebase from master
rebase