took out .circulate.not
Merge remote-tracking branch 'remotes/pagodabox/master'

Conflicts:
	templates/header.php