add support for the go1.4 src/pkg change
Merge branch 'master' of github.com:DisposaBoy/GoSublime
Merge branch 'master' of DisposaBoy/GoSublime

Conflicts:
	src/gosubli.me/margo/m_doc.go