pentadactyl: change the pocket script to allow save https pages
vim: update the README file to the new changes in the isort plugin
vim: use the git repository username to the python snippets
vim: change the Python script snippet to get the user and mail from the repository (works with git & mercurial)
vim: improved the script snippet, now supports bzr too and global values
vim: now, the script python snippet allows to change the license too
vim: make the Python script snippet faster
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:aaloy/dotfiles

Conflicts:
	vim/UltiSnips/python.snippets