Merge branch 'master' into develop
fix bug introduced where we subtly shifted to reloading the entire core instead of just one batch - [facepalm]
Merge branch 'fix-reload' of github.com:rwcarlsen/cycamore into rwcarlsen-fix-reload
Merge branch 'rwcarlsen-fix-reload' into develop
Merge remote-tracking branch 'up/master' into develop

in release 1.1, master was updated without flowing from develop to master. this merges those master commits back into develop.
Merge pull request #284 from gidden/dev-merge

Dev merge
Updating facilities with some cycic(ui) pragma.
fixed facilitylist to facility and added list to oneormores
incommodity/outcommodity annotation updates
Merge pull request #280 from FlanFlanagan/develop

Updating facilities with some cycic(ui) pragma.
uitype annotation for recipe_name in source fac
Merge pull request #285 from gidden/src

uitype annotation for recipe_name in source fac
You commandgo
Merge pull request #286 from scopatz/comma-comma-comma-chameleon

Adds missing comma to annotations.
added enrichment facility niche
Merge pull request #287 from scopatz/niche

added enrichment facility niche
version bump to v1.1.1, this version is to be used in conjuction with cyclus v1.1.1, cyclist v0.9, and cycic v0.9.
updated reflist.json
Tests now work with python3
Merge branch 'jdangerx-develop' into develop