Need to clean this up.
Merge branch 'master' of https://github.com/WillSams/Spark-Template