Make aligning preserve cursor position

This pull request also includes the ability to turn aligning off.