[COOK-4237] - Nginx version incorrectly parsed on Ubuntu 13

Signed-off-by: Sean OMeara <someara@opscode.com>
Merge branch 'master' of github.com:opscode-cookbooks/nginx
Merge branch 'master' of github.com:opscode-cookbooks/nginx
[COOK-4358] - clean up .kitchen.yml