minor tweaks
Merge remote-tracking branch 'lsmith/master'

Conflicts:
	index.php