Merge pull request #533 from s0undt3ch/develop

Several fixes and improvements.
added Archlinux PKGBUILD's:
- PKGBUILD-git:
  - pkgver() function from pacman 4.1 better pkg version
  - vcs function from pacman 4.1
- PKGBUILD
  - just snatch from aur.archlinux.com
allow config to inherit/override in order of importance
Merge pull request #536 from aboe76/archlinux_pkgbuilds

added Archlinux PKGBUILD's:
Merge pull request #537 from jbadigital/config-merge

Allow config to inherit/override in order of importance
Also patch `libcloudfuncs` in the AWS botocore driver to bring `__opts__` to it's scope.
Implement the changes to make use of saltstack/salt#4530