change rvm config, add homework submit file
fix failing specs after coderay update
add merge_with to article model + specs
add merge_with to content controller + specs
add merge link to admin _edit partial