Merge branch 'master' into prod

Author: nicksloan

resources/home.html

@@ -81,7 +81,8 @@ <h2>Community Sponsors</h2>
 	require_once('lib/Twitter.php');
 
 	// array of community_sponsors member Twitter handles
-	$community_sponsors = array('croscon', 'cakephp', 'wonderproxy');
+	$community_sponsors = array('croscon', 'cakephp', 'wonderproxy',
+    'lisamusing');
 
 	// array of Twitter data for each community_sponsors member
 	$data['community_sponsors'] = array();