p2
Merge branch 'p2' of github.com:ichylinux/daddy into p2

Conflicts:
	daddy.gemspec
	lib/daddy/cucumber.rb
	lib/daddy/formatter/daddy.css
	lib/daddy/formatter/menu.html.erb
	lib/daddy/git.rb
	lib/tasks/test.rake
p2