Some cleanup re: move feature
Merge branch 'master' of github.com:deepwinter/lattice