[scaladev]

Just squash the junk commits with rebase when you are done. It keeps the history clean and you have many points to revert to.