Add osx stuff an STM32 stuff
Merge branch 'master' of git://github.com/Belgarion/dotfiles

Conflicts:
	aliases