Makefile & gitconfig - ubuntu specific changes

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
add new files (for conky mostly)

Signed-off-by: Andrew Turner <andrewjamesturner0@gmail.com>
Merge branch 'mess' of https://github.com/andrewjamesturner0/dotfiles into mess