2014 06 30

Changes from the meeting on June 30th. Finalizing our style guide (for now).