Oh right, PHP 5.3, replace 'self' with 'Dipper' references where needed
Merge branch 'master' of github.com:statamic/dipper

Conflicts:
	Dipper.php