Ignoring .pyc files

Added .gitignore file for not uploading .pyc files
Fixed conflicts
comment install section if its emtpy
Re-added install section
Changed URL for development.ini and jetty
Changed URL for development.ini
Merging from travis_integration to master