added file type detection
Merge branch 'master' of https://github.com/zyskowsk/dotfiles
added new branch alias