added wifi-monitor per issue #418
Merge remote-tracking branch 'upstream/unstable'
moved spikeproxy to packages after updating it for ba
Merge branch 'master' of https://github.com/archey/blackarch into unstable