Squashed commit of the following:

commit 08ecdc7116fa3fcc935cfaa3dfee056d72286585
Author: Alex Tyler <reffyy@gmail.com>
Date:   Sun Apr 6 15:01:09 2014 +0100

    Reverted spec and yaml files.

commit 9e67921eaad148b6da193cba0908a2eed4821240
Author: Alex Tyler <reffyy@gmail.com>
Date:   Sat Apr 5 22:50:59 2014 +0100

    Swear I already committed these...

commit c79faa4fd4006fe3901f24c9469aa0469438e391
Author: Alex Tyler <reffyy@gmail.com>
Date:   Sat Apr 5 22:48:55 2014 +0100

    Change to the patch file.

commit 2ae6ea0b123d6c9facd8113bfffefae68bc0e14f
Author: Alex Tyler <reffyy@gmail.com>
Date:   Sat Apr 5 21:06:55 2014 +0100

    Added editmode-title patch. Allows the icons to be organized with the titles still visible.