Merge pull request #5 from archmage/dev

Merge dev into master in preparation for new release

.travis.yml

@@ -0,0 +1 @@
+language: scala

README.md

@@ -1,5 +1,5 @@
-# JobsheetMaker
-JobsheetMaker is a **customised CSV to PDF converter** that was originally developed to address a gap between a client's CRM features and their requirements. It was a project that was prototyped and pitched over around a week, then developed over two weeks and further supported over several months.
+# JobsheetMaker [![GitHub version](https://badge.fury.io/gh/archmage%2Fjobsheetmaker.svg)](https://badge.fury.io/gh/archmage%2Fjobsheetmaker) [![Build Status](https://travis-ci.org/archmage/jobsheetmaker.svg?branch=master)](https://travis-ci.org/archmage/jobsheetmaker)
+JobsheetMaker is a _customised CSV to PDF converter_ that was originally developed to address a gap between a client's CRM features and their requirements. It was a project that was prototyped and pitched over around a week, then developed over two weeks and further supported over several months.
 
 # Usage
 JobsheetMaker is specifically designed to be used with [Malinko](http://www.malinkoapp.com/), a CRM system. **JobsheetMaker's entire functionality is dependent on Malinko and its provision of services**, and if anything were to break on Malinko's end, JobsheetMaker cannot be held accountable.

build.sbt

@@ -2,15 +2,18 @@ lazy val root = (project in file(".")).
   settings(
     inThisBuild(List(
       organization := "com.archmage",
-      scalaVersion := "2.12.1",
-      version      := "1.5"
+      scalaVersion := "2.12.3",
+      version      := "1.6"
     )),
     name := "JobsheetMaker",
     fork := true,
     mainClass in Compile := Some("com.archmage.jobsheetmaker.MainApp"),
     mainClass in assembly := Some("com.archmage.jobsheetmaker.MainApp"),
+    resolvers += "Artima Maven Repository" at "http://repo.artima.com/releases",
     libraryDependencies += "com.opencsv" % "opencsv" % "3.8",
     libraryDependencies += "org.apache.pdfbox" % "pdfbox" % "2.0.4",
     libraryDependencies += "org.apache.poi" % "poi" % "3.16",
-    libraryDependencies += "org.apache.poi" % "poi-ooxml" % "3.16"
+    libraryDependencies += "org.apache.poi" % "poi-ooxml" % "3.16",
+    libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.1",
+    libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1" % "test"
   )

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.13
+sbt.version=1.0.2