Everything since last night
Merge pull request #1 from blaalz/master

End of Evernote Hackathon