Merge branch 'master' of https://github.com/isaacd9/gipsydanger into HEAD

Conflicts:
	Symfony/src/gipsydanger/indexBundle/Resources/views/index/index.html.twig
	Symfony/src/gipsydanger/peopleBundle/Controller/profileController.php
[Master] Fixed index by changing pointer directory. Still need to incorporate Zack's changes.
[Master] Changed names of join and sign up to match convention
[Master] Fixed brokennes around views. Shit should work now. Yay!
[Master] Fixed merge conflict. Zack, in the future these should be fixed locally. See diff for example.
Merge branch 'master' of https://github.com/isaacd9/gipsydanger into HEAD

Conflicts:
	Symfony/src/gipsydanger/indexBundle/Resources/views/index/index.html.twig
	Symfony/src/gipsydanger/peopleBundle/Controller/profileController.php