Switching to fixed version of Synapse
Merge branch 'develop' of https://github.com/Sage-Bionetworks/BridgePF into develop
Adding some hooks to reduce build/* conflicts
Correctly location of pre-commit hook
Resolving build.sbt conflict
Creating a task separate for the hook so we can change what it does
Merge pull request #8 from alxdarksage/develop

Changes to reduce build/* conflicts