Minor build tweaks

Author: codesqueak

build.sbt

@@ -2,10 +2,10 @@ name := "ScalaZ80"
 
 version := "0.1"
 
-scalaVersion := "2.12.3"
+scalaVersion := "2.12.4"
 
-libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.4"
-libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.4" % "test"
+libraryDependencies += "org.scalactic" %% "scalactic" % "3.0.5"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.5" % "test"
 
 scalacOptions ++= Seq(
   "-feature",

project/build.properties

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

src/main/scala/com/rodent/z80/Z80.scala

@@ -3,7 +3,7 @@ package com.rodent.z80
 import com.rodent.z80.cpu.{Processor, Registers}
 import com.rodent.z80.io._
 
-// Simpel test machine config and run
+// Simple test machine config and run
 object Z80 extends App {
   println("Z80!")
   val memory = new Memory()

src/main/scala/com/rodent/z80/cpu/ALU.scala

@@ -1,6 +1,6 @@
 package com.rodent.z80.cpu
 
-import com.rodent.z80.CPU._
+import com.rodent.z80.CPUZ._
 import com.rodent.z80.io.Memory
 
 import scala.language.implicitConversions

src/main/scala/com/rodent/z80/cpu/OptionalReader.scala

@@ -1,6 +1,6 @@
 package com.rodent.z80.cpu
 
-import com.rodent.z80.CPU._
+import com.rodent.z80.CPUZ._
 import com.rodent.z80.io.Memory
 
 // Process additional memory reads where required

src/main/scala/com/rodent/z80/cpu/OptionalWriter.scala

@@ -1,6 +1,6 @@
 package com.rodent.z80.cpu
 
-import com.rodent.z80.CPU._
+import com.rodent.z80.CPUZ._
 import com.rodent.z80.io.Memory
 
 // Process additional memory writes where required

src/main/scala/com/rodent/z80/cpu/Registers.scala

@@ -1,7 +1,7 @@
 package com.rodent.z80.cpu
 
-import com.rodent.z80.CPU.RegNames
-import com.rodent.z80.CPU.RegNames.RegName
+import com.rodent.z80.CPUZ.RegNames
+import com.rodent.z80.CPUZ.RegNames.RegName
 import com.rodent.z80.func._
 
 case class Registers(regFile1: BaseRegisters = BaseRegisters(),

src/main/scala/com/rodent/z80/cpu/package.scala

@@ -1,6 +1,6 @@
 package com.rodent.z80
 
-package object CPU {
+package object CPUZ {
 
   object RegNames extends Enumeration {
     type RegName = Value