Fix merge conflict.
Update gitignore to ignore pow/rvm.
Fixes mispelling in gitignore.
Removed database.yml
Added database.yml to gitignore.
Updated readme with new dev database setup and gem install details.
Added SMTP dev setup to gitignore and updated README.
Fixed spelling and wording on README.
Merge branch 'staging' of https://github.com/beyond-z/beyondz-platform
Merge pull request #13 from bgrayless/setup_gitignore_for_pow_rvm_and_db_yaml

Setup gitignore for pow RVM and database yaml