* ignore files
* ignore library
* update merlin
* update branch
* add mathpartir tex library
* add byobu configuration
* improve installer
* improve installer again
* update gitignore
* modify byoburc
* now update workspace when updating macports and opam
add lighttpd vim syntaxe
 On branch mac
 Changes to be committed:

	modified:   usr/bin/backup_remote
* ajout de l'article de plotkin dans les références
* update
	deleted:    usr/bin/backup
	modified:   vimrc
zshrc

Signed-off-by: Hubert <hubert.godfroy@inria.fr>
	modifié :   gitconfig
	modifié :   usr/share/tex/macro_these.tex
	modifié :   usr/var/bibtex/references.bib
* update macro.tex
Merge branch 'mac' of bitbucket.org:hurlebouc/workspace into mac