updating changelog file and removing watch file
Merge pull request #14 from rackerlabs/rackspace_production_2

updating changelog file and removing watch file