Adds latest snippet from Cedar
Updates Rakefile for appCode 3.1
Includes some housekeeping from appCode 3.1

Also cleans up some naming