- tweak bashrc
- add scala and cucumber plugins
Merge branch 'master' of github.com:gruntruk/dotfiles

Conflicts:
	.vimrc
	.zshrc