Add snippets directory and serverspec.snip.
Merge branch 'dev'