Upgrade rails gem to 4.1
css underscores to dashes
css note
merge from staging
fix broken conflict fix, oops i kept the wrong code
fix a syntax error
Merge from upstream.
Convert state machien logic over to aasm.
Merge in new aasm
Fix state machine callback for aasm.
Lock down version of aasm.
Setup config to use new rails 4.1 secrets.yml.
Setup config to use new rails 4.1 secrets.yml.
better way to do full name
Set task kind/file_types to enum.
Merge pull request #42 from bgrayless/rails_to_4_1

Rails to 4.1.0
Merge branch 'master' into add_enum_fields
Merge branch 'master' into text_task
refactoring login requirements
redirect / to be a relevant page for the current user