Move linux destkop conf to new directory
Merge branch 'master' of https://github.com/geekarist/dotfiles

Conflicts:
	sublime/User/Preferences.sublime-settings