little more spec cleanup
Merge branch 'develop' into patterns
fixed some eof newlines