Merge pull request #1 from dant3/no-hardcode

no hardcode
Merge pull request #2 from dant3/improvements

Improvements
fix long commands overlapping in prompt
Merge branch 'master' of https://github.com/max-potapov/macdotfiles

Conflicts:
	.bashrc