Merge branch 'master' of github.com:ITS-UofIowa/ip.uiowa.edu

Conflicts:
	.gitignore
Removed omega subtheme
Merge branch 'james'
Merge branch 'master' into test