update to latest nightly wordpress
update plugins (x7)
Merge branch 'master' of https://github.com/bigandy/big-andy.co.uk

Conflicts:
	wp