Removed dotcloud specific files from aristotle
Merged changes from cherry-picking ASP jobs for the MARC Batch Apps
Updated schema.org conflicts
Accidently pulled master, had to manually resolve merge