Change readme to emacs format for ease of updating through org-mode
Merge branch 'master' of github.com:map7/the_merger
Removed old field_selector code as this is in app/helpers instead
Remove rake from Gemfile
Add some dependencies for making my tests
Configure 'rake' to use spec as the default testing framework
Add some basic tests, but it's failing due to the engine
Adding dependencies to Gemfile and running bundle
Creating a spec_helper file with the requirements for Combustion
Ran 'bundle exec combust' to create a very small testing Rails app, just enough to test the engine
Add debugger
Remove foo method
Remove combustion_test.sqlite from git repo
Add two test tables
Add my first test for retrieving model fields
Simplify the user table
Refactor how we get the configured model
Simplify the names of methods
Refactor merge_fields and change the name of the main method, now it's called mail_merge(subject, body)
add a from variable to the mail_merge & update readme