Merge branch 'master' of https://github.com/18F/mirage
Merge branch 'master' of https://github.com/18F/mirage
Merge branch 'master' of https://github.com/18F/mirage
Merge branch 'master' of https://github.com/18F/mirage
changed an assertTrue to an assertGreater
added GA code
Merge pull request #300 from jroo/selenium

small selenium fix and added Google Analytics
Merge pull request #301 from kaitlin/master

Test coverage, misc tickets
Merge branch 'master' of https://github.com/18F/mirage
add green dot socioeconomic indicator
Merge pull request #302 from brethauer/master

add green dot socioeconomic indicator
change socioeconomic indicator from 'X' to a green dot
Merge pull request #303 from jroo/greendots

change socioeconomic indicator from 'X' to a green dot
updated tests to work with green dots (instead of X's)
Merge pull request #304 from jroo/greendots

updated tests to work with green dots (instead of X's)
Merge branch 'master' of https://github.com/18F/mirage

Conflicts:
	selenium_tests/tests.py