Merge cit-jmu repo into hanleybrand master

just do it!