Multiple enhancements

added scala path
Airline powerline addition
Merge branch 'master' of https://github.com/NickCody/dotfiles

Conflicts:
	dotbashrc