Merge pull request #22 from jacobwagner/master

ignore log and json files
added upgrade for 414
Merge branch 'master' of https://github.com/rcbops-qa/monster into upgrade_414
added logic to allow for release candidate upgrading
added logic to allow for release candidate upgrading
removed print
Merge branch 'upgrade_414' of github.com:jacobwagner/monster into upgrade_414

Conflicts:
	monster/deployments/chef_deployment.py
fixed merge error
Merge pull request #24 from jacobwagner/upgrade_414

Upgrade 414
added override to do package upgrades
Merge pull request #25 from jacobwagner/upgrade_414

added override to do package upgrades