Merge remote-tracking branch 'upstream/master'

Conflicts:
	packages/aircrack-ng-beta/PKGBUILD
truecrack: Move cuda to optdepends.
ruby--activemodel: Upgrade to version 4.0.2.
Merge branch 'master' of https://github.com/adminempire/blackarch into unstable
Merge pull request #599 from adminempire/unstable

Adding missing ruby1.9 dep and cleaning up some
Merge pull request #600 from adminempire/unstable

Adding all missing deps for wpscan
Add [oh-my-zsh] from BlackArch
Merge pull request #601 from fnord0/master

Add [oh-my-zsh] from BlackArch