Squashed commit of the following:

commit 2c40610c7944d012dd016f8393f46b59bc82f3c9
Merge: 397e4e3 9526c00
Author: Rob Tsuk <rob@tsuk.com>
Date:   Thu Jul 10 08:36:22 2014 -0700

    Merge pull request #75 from tblackwe/wave-6

    Admiral work complete

commit 9526c00df6b381768b7fa6c950b9bf868971a43e
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Wed Jul 9 20:17:00 2014 -0400

    cleaning up format

    Running formatter against files.

commit 6c3147ba2c39f875289959cff39d443542c74c6d
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Tue Jul 8 22:46:39 2014 -0400

    Moving Admirals up list

    and removing unusued code

commit 67e03785ce9bf455b05713f904d47763968468fe
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Tue Jul 8 22:34:55 2014 -0400

    Updating code for admirals

    Correcting +3 out of faction for admirals
    Removing Admiral (and any chance of Borg) from sideboard
    Making it so only 1 admiral can be assigned,
    updating test to show admiral slot

commit 2f4d71da94e254806196ef14c4958bc063349e57
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Sun Jul 6 13:05:25 2014 -0400

    Shelving changes for admirals

    Still needed:
    1 admiral per fleet
    Admiral cost incorrect out of faction
    show skill increase on inspect screen?

commit 4b74b22097b2d76860f87a8fe49a4126a3bbcd18
Author: Thomas Blackwell <tblackwe@gmail.com>
Date:   Sat Jul 5 23:13:25 2014 -0400

    Shelving changes for admirals

    Admirals working in Library, but not for ships.
Fix errors introduced when I changed admiral's upType to "Admiral".