Adding rubocop gem for code checking
Fixing some code that causes rubocop to error out
Fixing style problems in script directory
Temporarily turning off more rules in rubocop
Installing rubocop manually
Rubocop: Updating config to exclude files we haven't fixed yet
Merge pull request #2821 from daviddavis/temp/20130827141019

Rubocop: Updating config to exclude files we haven't fixed yet
Rubocop: Reformatting rubocop call in Travis script
Rubocop: Fixing problems in the lib directory
Merge pull request #2820 from daviddavis/temp/20130827135827

Rubocop: Fixing problems in the lib directory
Rubocop: Moving rubocop to development gem group
Merge pull request #2824 from daviddavis/temp/20130827173241

Rubocop: Moving rubocop to development gem group
Rubocop: Fixing db directory problems
Merge pull request #2823 from daviddavis/temp/20130827163112

Rubocop: Fixing db directory problems
Rubocop: Fixing config directory
Merge pull request #2829 from daviddavis/rubocop-config

Rubocop: Fixing config directory
Merge remote-tracking branch 'upstream/master' into rubocop

Conflicts:
	config/routes/api/v1.rb
	config/routes/api/v2.rb
Merge remote-tracking branch 'upstream/master' into rubocop
Bastion: Fixing reference to underscore 1.3.1
Merge pull request #2830 from daviddavis/temp/20130828103352

Bastion: Fixing reference to underscore 1.3.1