Merge branch '2-0-stable'

* 2-0-stable:
  Update changelog
  Make sure utf-8 characters in statuses don't break output

Conflicts:
	lib/engineyard-serverside/version.rb
Update and reformat the README