Fixed Camera Shake Bug

Camera now returns to player at the end of the camera shake and I fixed
an x/y confusion.

Options to tweak the camera shake are available in the camera settings,
including turning shake on and off, strength and duration of shake.