init.  Getting started with some organizational stuff
Merge remote-tracking branch 'origin/master'