adding a .gitignore file to ignore wp-config.php
adding show email attribute
fixing typo in comments
Merge pull request #2 from BFTrick/patch-1

Ignoring wp-config.php
Merge pull request #3 from BFTrick/patch-add-user-email

Add show_email Parameter to Shortcode
add .gitnore
Merge branch 'master' of github.com:pbearne/wp-author-avatars

Conflicts:
	.gitignore
move elements around and added deploy script
mainly show_email but a few other bits
added deployAuthor-Avatars.sh
Added user Selector to tinyMCE pop-up
added $user to aa_user_template flitter
Added caching and role filtering to get_user function
Readme update and var_dump remove
removed pre-wordpress 3:0 code
add a couple of missing variables
fix a couple more errors
added blogs to default
	$adv_right  = "";
		// incase we don't have any blogs
		if (AA_is_wpmu() && !empty($instance['blogs']))
			$adv_right  .= $form->renderFieldBlogs($instance['blogs']);

to stop undefined blogs
magor update [D[D[D[D[D[D[D[D[D[j[3~[3~[3~[C[C[C[C[C[C[C[C[C[C[C[C[C to added filters andsome caching