Some aliases and git configs
Merge branch 'master' of github.com:AntonNiklasson/dotfiles

* 'master' of github.com:AntonNiklasson/dotfiles:
  Added alias for python server.
  Some additions.

Conflicts:
	link/.bash_aliases
	link/.paths