Resetting to match Robin's develop branch

Preparing for a a new fresh start with git flow, therefore resetting
'master' to match Robins 'develop' branch as of 2013-03-09