cleaned up code based on feedback and added optional parameters and required parameters
fixed issue with broken test and fixed function leading to travis build failing
fixed formmating and color in Rakefile test output
removed unnecessary code -- also squashing commits into one