accept new generated gemfile.lock
Correct hash syntax
Merge pull request #1314 from jordansissel/fix-hash-syntax-docs

Correct hash syntax (no commas!)
Correctly set nice and ulimit -n

Previously, 'nice' was invoked incorrectly, and 'ulimit -n' would often
fail because growing it as a non-privileged user is denied.
Merge pull request #1322 from jordansissel/fix-sysv-init

Correctly set nice and ulimit -n
Merge branch 'master' into collectd-untergeek

* master:
  Correctly set nice and ulimit -n
  Correct hash syntax
  accept new generated gemfile.lock