updating merge conflicts for PR 289
Merge branch 'shawndwells-disa-oct2014-release-diffs'
Merge remote branch 'upstream/master'

Conflicts:
	RHEL/6/input/profiles/CSCF-RHEL6-MLS.xml
ticket 70 - auto remove temp accounts

added CCE to account_temp_expire_date, resolves issue 70
Merge branch 'master' of github.com:shawndwells/scap-security-guide
Merge pull request #349 from shawndwells/master

ticket 70 - auto remove temp accounts