Attempting to switch IDE's to Aptana Studio 3
Attempt to resolve merge conflicts.