Several id and link tag fixes
Fix placement of Content-type header statement
Don't return content-type in test mode
Merge pull request #1 from craywolf/craywolf

Several id and link tag fixes