small edits
Merge branch 'master' of github.com:heike/sine-illusion
Merge branch 'master' of github.com:heike/sine-illusion
style things
Merge branch 'master' of github.com:heike/sine-illusion

Conflicts:
	SineIllusion-Rearrange.Rnw