updated to ignore merge leftover files (orig) and ant builds