Feature/summer 14 changes

@jlantz ~ this should be ready for you to review.