cleaning up index page markup
Merge branch 'master' into imac-work

Conflicts:
	application/views/scripts/index/index.phtml
Merge pull request #5 from californiavol/imac-work

Imac work