button fixes and old foundation attributes removed from account_bar.html
fixed the conflicts
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pinax_theme_foundation/templates/account/login.html
	pinax_theme_foundation/templates/account/logout.html
Merge pull request #56 from ilendl2/master

Merge remote-tracking branch 'upstream/master'