Cleaned up some todos, notes
Renamed file, moved for clarity
Minor refactoring, variable renaming for clarity
Updated gruntfile, corrected errant information