customize name
ignore nbproject folder globally
get rid of the solarized-related config
this looks simply wrong, delete it
Merge branch 'master' of https://github.com/greg0ire/dotfiles

Conflicts:
	gitconfig
	vimrc
Merge branch 'master' of https://github.com/greg0ire/dotfiles
add meld for mergetool
add sismo
add ack-grep
change port
change bits color