Modify dependency heirarchy to work with gradle 1.3+