modified travis ci conf
added django to top file
fix travis...
modify pillar top [skip ci]
update gitignore [skip ci]
restructured travis handling
add pillar example for django state [skip ci]
small fix and removal of a useless file
Merge branch 'master' of git://github.com/danieljn/salt-states
Merge remote-tracking branch 'upstream/master'