Updated the capistrano script for loading data: "cap production load_data" or "cap staging load_data"
Merge pull request #266 from akofink/master

Capistrano script update.
Converted dos2unix recursively
Added a task in the capfile for alldos2unix for a recursive dos2unix
Merge pull request #267 from akofink/master

alldos2unix cap task
View My Scores bug fix #270

Any record can be found by its primary key in the database if you
know what type of object you are looking for. Any time you have
an id passed in as a parameter, you can use the top level class
name which corresponds to the primary key in the database.

In this instance, the code was looking for an AssignmentQuestionnaire
object, and the id was available, so using the code
self.assignment_questionnaire.find_by... throws a NoMethodError
because the 'find' method is a class method of each model, not
an instance method called on a specific object.
Merge pull request #271 from akofink/master

Bug fix for #270
Revert "View My Scores bug fix #270"

This reverts commit a55798389502afcb7f8f86e5025cd2dfad59a883.

This bug fix was not correct.
Bug fix for #270

Someone renamed the assignment_questionnaires in the Questionnaire
object from assignment_questionnaire to assignment_quesetionnaires.

I renamed this instance variable appropriately in the
compute_weighted_score method.

Finding the assignment questionnaire with AssignmentQuestionnaires.find
seemed like a good solution before, but by using the Questionnaire's
assignment_quesetionnaires foreign key relationship, the total
AssignmentQuestionnaires are actually filtered in scope. This seems
to prevent AssignmentQuestionnaires with the same Assignment id
from being found in this method. Only AssignmentQuestionnaires that
belong to this Questionnaire are searched.
Merge pull request #273 from akofink/master

Bug fix for #270 and #272.
Updated the capistrano script

Commands:
cap production load_data # Load the production data
cap staging load_data # Load the staging data
Merge pull request #275 from akofink/master

Update to the Capistrano script
Updated the cap deploy script for more verbose output
Merge remote-tracking branch 'upstream/master'
Added a proxy option in the cap script.
Now you can deploy and load_data from any
address and port in order to communicate through
an outside server.

Here are added commands:
(You will be prompted for a server, port, and user name)
cap proxy load_data # load data from a proxy
cap proxy deploy # deploy to the proxy server
Cleaning up non-expertiza files
Merge branch 'master' into e734-analytics

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	app/models/questionnaire.rb