minor changes, adding rc dir support...
Autocommit at Wed Oct 22 12:19:44 BST 2014