bumped version,
cleaned up image tagging so that the entire codebase incorporates the version number
Merge remote-tracking branch 'upstream/master'
Added tests for rspec, adjusted output formatting