Merged work dotifiles with the more recent verion on the repo