[20170125173147] CLI Improvements and Rack fixes

[ddollar]

• #1555 Convox env set [@soulshake]
• #1594 Initial commit adding --id to ‘convox env set’ [@soulshake]
• #1603 add lock around inotify.AddWatch [@ddollar]
• #1611 Update syslog role to match stack name, not function name [@mattmanning]