current, hide home, fixed logo
consistent menu
Merge branch 'master' of github.com:sudocoda/drupalsite

Conflicts:
	.DS_Store
	themes/waterloo/css/colours.css
	themes/waterloo/css/layout.css
	themes/waterloo/template.php