New gitignore
Cleanup and no more h alias method
Move flashes around to the right area
Getting xml setup
Updating XML output
Gemfileing
Resolving merge conflicts