Bring syntax up to 3.0
Merge branch 'master' of github.com:RyanThompson/Timezone

Conflicts:
	field.timezone.php