add ignore
Merge remote-tracking branch 'origin/master'
Add git alias
Merge remote-tracking branch 'origin/master'
update vim setting
Merge remote-tracking branch 'origin/master'

Conflicts:
	.bashrc
	.vimrc.basic
	.vimrc.neobundle
	.zshrc
	bin/tmux-mem-cpu-load
merge
Fix iroiro
Merge remote-tracking branch 'origin/master'
Update vimrc
Update vimrc, tmux.conf
Update pyclewn
Merge remote-tracking branch 'origin/master'