Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Add first version of the ks26981.imingo.com
Call fasd only when installed.
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' of github.com:pixelastic/oroshi
Fix vim-unimpaired to v1.2.
Merge branch 'develop'

Conflicts:
	config/zsh/aliases.zsh
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'