Add installation instructions in README
Merge pull request #31 from chdoig/patch-1

Add installation instructions in README
Bump to alpha of bugfix
Adjust comparison to handle this living inside conda-env

The original was written in a way that it would compare the current
running script to the called script.  Now that `env-activate` is called
inside `activate`, that comparison is no longer accurate.  This looks to
the basename of the executed script to see if it was `activate`.
Bring the same logic from the previous commit into deactivate
Fix issue with activate/deactive being executed directly (v1.2.2)
Switch to using CONDA_PY for binstar build
Switch back to engine until CONDA_PY is supported
Merge remote-tracking branch 'conda/master' into refactor/add-environment-object

Conflicts:
	conda.recipe/meta.yaml
	setup.py