Merge pull request #82 from mancdaz/master

Merged automatically by jenkins after successful build test
End of sprint version bump.
End of sprint version bump.
ENHANCEMENT: Default to Folsom
Merge pull request #83 from rackerjoe/work

Merged automatically by jenkins after successful build test
make apache listen on specific ip not all