All-in-one

Sorry, I got too many pending pull requests with my working copy going south. Pull'em and merge them so we can move forward but I really need a different workflow or I will loose my mind pretty soon...