Fixed some bugs and - Squashed commit of the following:

commit 7acd59465e9ebb6dcbe1375f626f4215766f35a9
Author: dcraven <dcravenus@gmail.com>
Date:   Tue Aug 5 19:32:02 2014 -0600

    Removed vestigial code

commit 1d93baa32b6a001ee546a56234a2aa3d445f1628
Author: dcraven <dcravenus@gmail.com>
Date:   Tue Aug 5 16:55:12 2014 -0600

    Tidied up getNextColor function a little bit

commit 8b0b863d7668d08a5623b83f9d1e652b8ecbe4f8
Author: dcraven <dcravenus@gmail.com>
Date:   Tue Aug 5 16:46:01 2014 -0600

    Different colors now works