Indentation

Cleaned up existing indentation to be more consistent, added vim modelines to keep Zeke from making it inconsistent in the future.