Version bumps
Disable SNS chef error handler
Merging conflicts