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
Direct linking to history
Remove unnecessary line
Modify diff
fix spacing
spacing fixes
more spacing fix
spacing
Merge pull request #49 from groupon/doug/1

merged