removed tmp files - should have been ignored
removed unecessary tmp sprocket files
merging branch