/usr merge

See http://www.freedesktop.org/wiki/Software/systemd/TheCaseForTheUsrMerge/