Update keywords and dl
Python 3.4 for travis
Merge branch 'master' into stable

Update for 3.4 and setup