footer1.html
- don't apply magstyle when nomag=1 is in url
- move aside-2 and aside-3 to mag style row-3, span 4
- fixed issue when 5 entries did not use mag style

header1.html
- fixed issue where param in url with no value was not
  recognized as true

template.xml
- added twitter-container id
- added div around main, aside-1, and footer