Set up for trusty64 - not working yet

* install completes but solr connections don't work
changed test.ini_tmpl to comment out openspending.solr.url
working version.  switched to jetty servlet container for now.
cleaned up tomcat & comments added.
Fix labels E-Mail to Email
Grammer Fixes in View Form

Fixes issue #813
================================================================================
Removed the duplicate "the"s and reduced the redundant "change and modify" to
"modify", as mentioned in issue #813.

Also added a comma before "but" in the second sentence, as the conjunction
separates main clauses, and restructured the final sentence so that it does not
end with a preposition.
Merge pull request #820 from Faokryn/master

Grammer Fixes in View Form
Merge pull request #819 from hagino3000/feature/unify-email-label

Fix labels E-Mail to Email
Add Colin O'Neill to the CONTRIBUTORS file
Add Takashi Nishibayashi to the CONTRIBUTORS file
Update i18n

Update .pot file and .po files with new strings for translations.
Patch version 0.15.2

Grammatical and spelling error updates (along with new translation
files).
Include only languages which have been translated over 50%

We have a lot of languages which are not translated enough to
give users a good experience (users might switch to a language and
see no changes at all and think that OpenSpending is broken).

This is also a motivation for translator teams to push the
translation above a line to get it included and reward those who
have put in effort to complete translations.
reverted changes for test.ini_tmpl.  Solr port on original was 18983 for some reason. Set to standard solr 8983.
vagrant_deploy generates test.ini and uses development.ini.  startserver helper script updated to reflect.
installation documents update.
installation documents update.
small change to install.rst
Merge remote-tracking branch 'jakemadison/issue817_vagrant_fix_2'

Conflicts:
	bin/vagrant_deploy
Add Jake Madison to the CONTRIBUTORS file