bugfix
Re-ordered the list of commands from pull.sh
Updated gitignore
Merge branch 'master' into django17