Add missing import.
Although @thatch45 hasn't finished his work, try to fix the logic in place.
Add missing letter.
Add index resolution to roots
Fix grains for Amazon and Fedora Remix
Merge pull request #3534 from techhat/grains

Fix grains for Amazon and Fedora Remix
Fix logging in the salt loader to specify module tag type

Also cleaned up some formatting and got rid of a very old TODO
that has long been solved in another way
Add index support to gitfs
Be more precise in the error check for invalid index
Fix final issue in gitfs index support
Added check in modules.locale for empty string in locale. This
safeguards against an empty string in locale
Merge pull request #3536 from auser/develop

Added check in modules.locale for empty string in locale.
single quotes
only set nocache tag if called for
When going through the API, selected_target_option is always 'None'. That brakes grains-based minion-discovery for the batch run when running through the API. The expr_form is always set, so we can default to that safely instead of glob.
lookup nocache option
fix spacing in job ctrl-c message
need to pull from the publish kwargs section
Add ipv6_enable option
meh, None does not int cleanly!