Working out the kinks in the Git and Aptana workflow