HW1-1b.1 Bug Fix - user name was inconsistent between user and article table creation.

* When creating users in blog_steps, "_name" was appended, but it was not appended
  * when creating articles and assigning a user to the articles.
* Removed "_name" suffix when creating users
* Added :author field when creating article
* Scenario for logging in as publisher and going to edit page now properly works
* (previously going to the edit page failed because the user name lookup failed)
HW1-1C.1: Implemented view and controller functionality to pass cuke scenarios
 testing for admin seeing the option to Merge Articles,
 and non-admin not seeing the option.

* In controller: added logic to only show merge feature if current user is admin
  * and if the edit action has been invoked (as opposed to new action)
* Modified new.html.erb to render the _merge_articles partial if merging is allowed
* Added _merge_articles partial template to render the form elements for merge articles

-->both cucumber scenarios from HW1-1B.1 now pass.
HW1-1C.1 - minor cucumber scenario update

* Added tags - for convenience in running only specific tests
* Added check for "Uploads" when logged in as publisher, to have a positive
  * confirmation test, not just a negative absence test
HW1-1B.2: progress towards merge articles features

* Added step definition for filling in article ID into merge_with field
* Fixed merge_with text_field formatting in merge_articles partial template
HW1-1C.2 - Started implementing controller spec and code for merge articles

* Added most basic test - for admin user and article access rights
  * Implemented specs and controller code for merge action in content_controller

* Still need to add specs and code for doing the actual merge
    in both controller and model
HW1-1C.2 - intermediate commit

* Added support in content controller and spec to call merge.
* Stubbed the functionality in the model to actually do the merge.
* Have not yet implemented the functionality in the model to do the merge.
HW1-1C - Finished implementation of merge functionality in controller and model.

* Cleaned up specs in content_controller to test for calling merge_articles,
  * destroying the orignal articles, and redirecting as expected.
* Added specs in article_spec to test merging of articles, happy and sad paths
* Implemented Article.merge_articles in article.rb

Still need to finish getting the remaining cucumber scenarios to all pass.
HW1-1C - completed implementation and tests

* Rest of cucumber test now passing (scenarios 3-5)
  * Added xpath matching for author and title in articles index list
  * Added comments to each article, and check for merged comments
  * Added other necessary step definitions
* I believe all the functionality and testing is now complete for HW1-1