minor fix to find_orientations, trivial changes to example yml file
Merge branch 'master' of github.com:joelvbernier/hexrd

merge changes performed in parallel...
Merged Darren's changes from praxes/master
small fixes to Darren's last commit
small fix to active_hkls handling in orientations.py
Merge remote-tracking branch 'joelvbernier/master' into master

Conflicts:
	conda.recipe/meta.yaml
	hexrd/coreutil.py
	hexrd/indexing/orientations.py
	share/example_config.yml