Merge branch 'danveloper-master'
Merge branch 'master' of github.com:Netflix/Prana
Shutting down the additional server created during test