Merge branch 'master' into tristan_MR_proj
adding the solution key to mapreduce
Merge branch 'master' into tristan_MR_proj
if completed, return true for has time remaining
Link now says 'View Expired Project' for unfinished expired proj
adding expired? to project_status model
fixing mark's suggestion, removing comment and use find_by
Merge branch 'master' into tristan-master
Merge branch 'master' into tristan_MR_proj
major QA + finish the tail + verification
Merge branch 'tristan_MR_proj' into tristan-master