Change contact format regexp to support international top level domains (i.e. noc@xn--80aaah4ap9bee8g.xn--j1aef)

Signed-off-by: Kenneth Kalmer <kenneth.kalmer@gmail.com>
Merge branch 'rails222'
More upgrade cleanups
Doc tweaks
Updated TODO
Gone with old rspec
rspec & rspec-rails 1.1.11 as plugins
acts_as_audit updates
Removed executable bit from models
FactoryGirl gem
factory_girl_on_rails plugin
Welcome cucumber
Dammit, more overlooked upgrade files
New Macro and MacroStep models with initial specifications
Classic acts_as_list plugin
MacroStep acts_as_list implementation
Jesse Newland's resource_this plugin
New ScopedFinders module for common owner scoping ActiveRecord queries
haml 2.0.6
Association updates to Macro

Fixed regression with prototip not working with older haml
Made flash[:notice] visible in views (resource_this compatibility)