Fixed a bug in the redirect directive added in the last commit, and added some RewriteCond directives to disable caching and the automatic redirection to www.andrewgillard.com (from, e.g., dev.andrewgillard.com) when in development mode.
Various updates
Merge branch 'master' into dev

Conflicts:
	public/.htaccess
	public/dns-check.php
Undo a merge fuckup.
Disabled Flickr since its API now requires HTTPS and ZF1 won't be using that. The flickr sidebar box is way too unimportant for me to spend time investigating if a fix is possible for this.
Updated CV.
Changed "looking for work" message to include contract availability.
Merge branch 'dev'