Updated FAQ
libxml2-dev changed version number unexpectedly!
Merge branch 'develop'
lifelines, pandas changes
Added emcee to salt
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer
Undid accidental commit to master
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of https://github.com/andrewclegg/snake-charmer
Added mpld3 to readme
Commented out opencv deps for now
Merge branch 'master' into develop

Conflicts:
	salt/roots/pillar/python34.sls
Beginnings of Vowpal Wabbit support