remove unused stuff
Merge branch 'master' of https://github.com/pyne/pyne-ci into remove_stuff

Conflicts:
	conda_build.sh
Merge pull request #21 from pyne/remove_stuff

remove unused stuff