1.0-merge: merging in stuff from stash
1.0-merge: committing so i can apply stash
1.0-merge: more hardcore stashing action
1.0: lots of fun new things :)