Merge branch 'develop' of ssh://github.com/pharpend/lysa into develop
Merge branch 'develop' of github.com:learnmath/lysa into develop
Add a possible solution for the editors thing
Use brackets instead of double dashes to indicate role in project.
Add final build system.
Fix typo in deploy script.
Print out link to build in deploy_server.
Add details on Travis to contributing guide.
Add section on skipping Travis build. [ci skip]
Merge pull request #46 from wei2912/roles-formatting

Use brackets instead of double dashes to indicate role in project.
Fix inconsistent formatting of emails in the README.
Merge branch 'develop' of github.com:learnmath/lysa into develop

Conflicts:
	README.md
Mention builds in README.
Minor improvements to contributing.md
Merge pull request #48 from wei2912/travis-guide

Add details on Travis to contributing guide.
Rearrange text such that nightly builds appear earlier. [ci skip]
Merge pull request #49 from wei2912/travis-guide

Rearrange text such that nightly builds appear earlier.
Removed middle initials from names.

The convention I thought existed apparently doesn't.
Copyright notice is now in footnote size.

This makes it look nicer, and also makes the formatting a bit nicer.
Remove import of tabu.

It isn't needed at the moment, but does cause the Travis build to fail.