Merge pull request #43 from jdjkelly/staging

Staging
Merge pull request #44 from jdjkelly/staging

Corrected meals header
made journal_entries
Merge pull request #45 from pycal/master

made journal_entries
Locked devise
Updated ruby versions
Corrected devise_mailer_sender settings env path
changed db columns feelings and strategies to support long notes
Merge pull request #46 from pycal/master

changed db columns feelings and strategies to support long notes
Added Encryption to Journal Entries

We're going to use the symmetrical encryption gem. It strikes
me as the most cryptographically informed. They mention and explain
why/how to use random_ivs for example.
Added Encryption to Journal Entries

We're going to use the symmetrical encryption gem. It strikes
me as the most cryptographically informed. They mention and explain
why/how to use random_ivs for example.
Added model annotations
Slightly improved user page
Resolved merge conflicts