Squashed commit of the following:

commit 3389560fe9
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Sat Nov 19 15:38:11 2016 +0000

    Removed unicode things

commit 060f94f565
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:10:28 2016 +0000

    Apparently output goes to stderr?

commit b41109dd9e
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 16:01:39 2016 +0000

    127 not localhost?

commit 77c45273b0
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:54:12 2016 +0000

    Allow server time to start up

commit ee06ff0765
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:48:38 2016 +0000

    sudo sudo

commit 9f0f31c023
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:47:45 2016 +0000

    Move sql install to before_install

commit 51b49dc176
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:46:02 2016 +0000

    Fixed a typo

commit 2b90620b4c
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:45:10 2016 +0000

    Mysql pls

commit 7f4e2b9f62
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:42:32 2016 +0000

    Switch to trusty travis

commit 64e39b7983
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:35:31 2016 +0000

    Switch to trusty travis

commit 4468564860
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:30:30 2016 +0000

    Stop being a tard

commit 0a9f534fa7
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:28:04 2016 +0000

    Check mysql version

commit 887a6d82a7
Author: Hannah Ward <Hannah.ward9001@gmail.com>
Date:   Fri Nov 18 15:17:26 2016 +0000

    Print a bit of debug info

.travis.yml

@@ -1,24 +1,31 @@
+dist: trusty
+sudo: required
+
 language: python
 
 python:
-    - "2.7"
     - "3.5"
     - "nightly"
 
-cache: pip
-
 services:
     - mysql
 
 env:
     - OPENTAXII_CONFIG=$TRAVIS_BUILD_DIR/config.yaml URL="http://ec2-52-42-201-6.us-west-2.compute.amazonaws.com" APIKEY=Vjy0ra7wO6w6si7hbjxX52nARfVpaAO6Tm6lxeSm
 
+before_install:
+    - sudo apt-get install mysql-server-5.6 mysql-client-core-5.6 mysql-client-5.6
+
 install:
+    # Check the config is ok
+    - echo $OPENTAXII_CONFIG
+    - mysql --version
     # Set up the deps
     - git submodule init 
     - git submodule update
     #Configure hooks
     - <misp_taxii_hooks/hooks.py sed 's@\[URL\]@'"$URL"'@; s@\[APIKEY\]@'"$APIKEY"'@' > misp_taxii_hooks/hooks.py
+    - head -n20 misp_taxii_hooks/hooks.py
     - python setup.py install
     # Install OpenTAXII
     - cd OpenTAXII
@@ -31,10 +38,11 @@ install:
     # Populate databases
     - opentaxii-create-services -c services.yaml
     - opentaxii-create-collections -c collections.yaml
-    - opentaxii-create-acccount -u travis -p travis
+    - opentaxii-create-account -u travis -p travis
 script:
     - opentaxii-run-dev &
     - pid=$!
+    - sleep 15
     - cd tests
     - nosetests .
     - cd .. 

tests/cve-in-exploit-target.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"

tests/malware-characterization-using-maec.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package 
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"

tests/test.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" ?>
 <stix:STIX_Package
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:stix="http://stix.mitre.org/stix-1"

tests/test_upload.py

@@ -7,7 +7,7 @@ def test_push():
     for fname in glob.glob("*.xml"):
         proc = subprocess.Popen([
                         "taxii-push", 
-                        "--path", "http://localhost:9000/services/inbox", 
+                        "--path", "http://127.0.0.1:9000/services/inbox", 
                         "-f", fname, 
                         "--dest", "collection", 
                         "--username", "travis", 
@@ -18,5 +18,4 @@ def test_push():
                 )
 
         out,err = proc.communicate()
-        print(out)
-        assert("Content block successfully pushed" in out.decode("utf-8"))
+        assert("Content block successfully pushed" in err.decode("utf-8"))