formatting
Merge branch 'smooth_step' of github:khegeman/curl_noise into smooth_step

Conflicts:
	experiments/poly.cpp
	experiments/poly_intrinsic.cpp