Comment out phil migration for dev work - - barfs on .affiliations call
Merge pull request #53 from zkay/migrationbuildissue

Comment out phil migration for dev work - - barfs on .affiliations call
Declare Ruby version explicitly - - Cedar stack demands it or defaults to 2.0.0. Good practice.
bundle update rails - - On 3.1.2
Upgrade jquery-rails, rails_admin, and dependencies to match rails 3.2.17 upgrade
Update haml gem for namespacing issue introduced with rails 3.2.17 && dependencies upgrade
Remove explicit ruby version declaration - - for another day.
Merge pull request #54 from zkay/dev

Upgrade Rails => 3.2.17, rails_admin, misc dependencies.
Merge remote-tracking branch 'upstream/master' into upgrade-rails-admin

Conflicts:
	Gemfile
	Gemfile.lock