update gitignore
Merge branch 'master' of github.com:ITS-UofIowa/transportation.uiowa.edu

Conflicts:
	.gitignore
updated flexslider styles to override defaults from contrib updates
Merge branch 'refs/heads/master' into test