Merge branches 'master' and 'master' of git://github.com/aasm/aasm
refactoring: simplify Event initialization
extracted dsl helper from event
fixed consistency: call transitions callbacks in context of record; added dsl declarations support to transitions
fixed options parsing order
fixed auth_machine, used different syntaxes to do same thing
renamed on_transition callback to after
improved guards example in readme
fixed typo
more specific spec
Merge branch 'master' of https://github.com/stiff/aasm into merging-stiff-master

Conflicts:
	README.md
	lib/aasm.rb
	lib/aasm/event.rb
	lib/aasm/transition.rb
	spec/unit/transition_spec.rb
callback :on_transition renamed to :after and changed its binding (see #59)
Merge branch 'aasm4_squash_merging_stiff_master' into merging-stiff-master

Conflicts:
	lib/aasm/transition.rb
	spec/unit/transition_spec.rb