Include the latest updates from pull requests to bryanbraun/poor-mans-styleguides (through December 17th 2014).