updates today
cleanup code
:Merge remote-tracking branch 'origin/master' into 20141118

Conflicts:
	sites/all/drush/drushrc.php