Merge branch 'master' into prod

Author: nicksloan

resources/home.html

@@ -83,7 +83,7 @@ <h2>Community Sponsors</h2>
 
 	// array of community_sponsors member Twitter handles
 	$community_sponsors = array('croscon', 'cakephp', 'wonderproxy',
-    'lisamusing','thezippykid', 'companyfiftytwo');
+    'lisamusing','thezippykid', 'companyfiftytwo','binarypress');
 
 	// array of Twitter data for each community_sponsors member
 	$data['community_sponsors'] = array();