Formatting update
Merge branch 'master' into doug/1
Merge pull request #48 from groupon/dwillson/update

pom edits for artifact deployment
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
Direct linking to history
Remove unnecessary line
Block the X-ODO-REQUEST from getting stored in history
Modify diff
Fix spacing
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