removed capistrano 2.15
Merge pull request #14 from christophwong/making-server-work

removed capistrano 2.15
need gems for deploy
Merge pull request #15 from christophwong/deploy-gems

need gems for deploy
fixing base to Base
Merge pull request #16 from christophwong/fixing-typos-and-specifying-ruby-for-heroku

fixing base to Base
deleting file for heroku
Merge pull request #17 from christophwong/deleting-taggable-class-for-hero

for you Nations
trying to update my branch, man.
Merge branch 'master' into alchemy-initial-setup
able to access the api for some scripts
change content column in the journal_entries table from string to text
all setup, lets do this