Added support for Rails 4.1+ enums.
Merge branch 'feature/enum' into feature/enum-master

Conflicts:
        README.md
:enum configuration now can be omitted if AASM column points to an
integer column. :enum can be set to true; in this case AASM would infer
enum method name from AASM column name.
Minor fixes / additions to the README file (enum-related section)
README formatting fix.
transitions_from_state considers missing from state
do not version-control bundler log files
do not yet use RSpec 3
Merge branch 'master' of https://github.com/daniel-rikowski/aasm into daniel-rikowski-master
Merge branch 'daniel-rikowski-master'
version bump to 3.2.1
Use lambda when defining Rails 3 scopes
Merge pull request #144 from laurens/fix-rails3-scope

Use lambda when defining Rails 3 scopes
Merge pull request #124 from bkon/feature/enum-master

Support for edge rails enum fields.
version bump to 3.3.0
Fix enum syntax
Merge pull request #149 from niku/patch-1

Fix enum syntax
bugfix: permissible events will respect given guards #150
version bump to 3.3.1
Merge branch 'master' into after_commit_not_saving