Cleaned up the code a bit
updated sbt dependencies to 0.13.0
Rearranged some code so its more apparent where it is used