Fixing commit hell

Change-Id: Icf14910709557989edbb4ecd892a84bbe6e61d2d
Merge branch 'master' of github.com:Knewton/Ford