aide role
Newrelic support for lms/cms python
Working newrelic
fixes
Upgrade setuptools with pip upgrade to prevent pkg_resources.DistributionNotFound errors
Merge pull request #1099 from edx/cg/setuptools_upgrade

Upgrade setuptools with pip upgrade to prevent pkg_resources errors
Double equals.
Merge pull request #1100 from edx/feanil/req_typo

Double equals.
Update CMS Hostname to be more liberal.
Merge pull request #1101 from edx/feanil/cms_nginx

Update CMS Hostname to be more liberal.
Different apps for lms and cms
snort role
Merge pull request #1097 from edx/e0d/lt-newrelic

E0d/lt newrelic
Security update  Ansible 1.5.5

Security update  Ansible 1.5.5
Merge pull request #1102 from edx/han/requirements

Security update  Ansible 1.5.5
removing setuptools freeze
Merge pull request #1104 from edx/han/vagrant.sh

removing setuptools freeze
Merge pull request #1094 from edx/derf/ids_roles

IDS roles
Merge remote-tracking branch 'upstream/master'