Merge PR #70 from adamdruppe\devisefixes
Devise fixes