Make vanilla to upstream
Merge remote-tracking branch 'upstream/master' into devel
Dont remove /etc/sysctl.conf
Merge pull request #20 from manjaro/master

Merge Master History and changes into Development
Not needed anymore for mhwd
Merge remote-tracking branch 'upstream/development' into devel
Adapt to upstream Packages-Xorg change
Merge branch 'devel'