Re-add @ and # before saving Pantography's own tweets

This maintains the database integrity and ensures that we calculate the
next pantograph properly.
Use devise for Evernote authentication

Evernote authentication was conflicting with devise. Devise omniauthable
overwrites some of the standard omniauth methods.
A user's role is marked as admin if she authenticates with the same
Evernote account described in the services settings.
Merge remote-tracking branch 'upstream/staging' into staging

Conflicts:
	db/schema.rb