Formatting update
Merge branch 'master' into doug/1
Modify history formatter
Removing excess code
Merge branch 'master' into doug/1

Conflicts:
	proxylib/src/main/java/com/groupon/odo/proxylib/PluginManager.java
Spacing fix
Fix
Addressing comments
Update config for beta.4 snapshots
Direct linking to history
Remove unnecessary line
Modify diff
fix spacing
Merge pull request #51 from groupon/davidv/portfix

Block the X-ODO-REQUEST from getting stored in history
Merge pull request #50 from groupon/dwillson/update

Update config for beta.4 snapshots
spacing fixes
more spacing fix
spacing
Merge pull request #49 from groupon/doug/1

merged
Fixing an issue where request/response override arguments could be mixed up in the UI