Jwarden dev

merging changes to default.rb