refactoring hard
Merge branch 'refactor' of http://github.com/bradleyd/rinit into refactor