Rebased develop to master

commit 694562c924a96aeac0590325cd8bb7a54350b99e
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Tue Jun 18 14:17:24 2013 +0100

    Release 0.9.0

commit d6a24f6d395c0f4d08d875c743b8ac7d258e6c83
Author: Michael Marconi <michael@modeltwozero.com>
Date:   Tue Jun 18 14:09:32 2013 +0100

    Product rename
Bumping version to 0.9.1-SNAPSHOT