- screenshot path
Merge branch 'master' of github.com:pansen/dotfiles

* 'master' of github.com:pansen/dotfiles:
  some enhancements
  - add ``ssh-add`` args
  - integrate ``.bashrc`` as usual in linux, detect linux via variable
  - dircolors in debian
  aliases
  fix git shortcuts
  force firewall, try using another timeserver

Conflicts:
	.osx