Jrnl config
Nicer shell for OS X
Reorganizing things
Very simple command line calculator
Merge branch 'master' of github.com:x3ro/dotfiles

Conflicts:
	sourceables/ps1.bash