blackarch-dwm: Move files back a directory.
blackarch-dwm: Add some files to source.
blackarch-dwm: Mark as conflicting with and providing dwm.
Merge branch 'master' of https://github.com/noptrix/blackarch into unstable