Keychain config is now optional

Squashed commit of the following:

commit fcc1e71c536d92e304f4404a546e7e87f2a78125
Author: Alex Fish <fish@ustwo.co.uk>
Date:   Fri Aug 1 16:24:56 2014 +0100

    Bumping version number

commit a3a08e81746b511f3464da0ab15f823c5d67a7b2
Author: Alex Fish <fish@ustwo.co.uk>
Date:   Fri Aug 1 16:04:28 2014 +0100

    Making keychain config optional